diff --git a/src/main/java/io/appium/java_client/proxy/Helpers.java b/src/main/java/io/appium/java_client/proxy/Helpers.java
index d162c3ed5..7224d763d 100644
--- a/src/main/java/io/appium/java_client/proxy/Helpers.java
+++ b/src/main/java/io/appium/java_client/proxy/Helpers.java
@@ -31,9 +31,9 @@
 import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
+import java.util.WeakHashMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -50,7 +50,8 @@ public class Helpers {
     // the performance and to avoid extensive memory usage for our case, where
     // the amount of instrumented proxy classes we create is low in comparison to the amount
     // of proxy instances.
-    private static final ConcurrentMap<ProxyClassSignature, Class<?>> CACHED_PROXY_CLASSES = new ConcurrentHashMap<>();
+    private static final Map<ProxyClassSignature, Class<?>> CACHED_PROXY_CLASSES =
+        Collections.synchronizedMap(new WeakHashMap<>());
 
     private Helpers() {
     }
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedWidgetTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedWidgetTest.java
index 3c1c9145d..26e0d2f74 100644
--- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedWidgetTest.java
+++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedWidgetTest.java
@@ -12,20 +12,29 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.toList;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.lessThan;
 import static org.openqa.selenium.support.PageFactory.initElements;
 
 
 @SuppressWarnings({"unchecked", "unused"})
 public class CombinedWidgetTest {
 
+    /**
+     * Based on how many Proxy Classes are created during this test class,
+     * this number is used to determine if the cache is being purged correctly between tests.
+     */
+    private static final int THRESHOLD_SIZE = 50;
+
     /**
      * Test data generation.
      *
@@ -57,6 +66,7 @@ public static Stream<Arguments> data() {
     @ParameterizedTest
     @MethodSource("data")
     void checkThatWidgetsAreCreatedCorrectly(AbstractApp app, WebDriver driver, Class<?> widgetClass) {
+        assertProxyClassCacheGrowth();
         initElements(new AppiumFieldDecorator(driver), app);
         assertThat("Expected widget class was " + widgetClass.getName(),
                 app.getWidget().getSubWidget().getSelfReference().getClass(),
@@ -161,4 +171,32 @@ public List<PartiallyCombinedWidget> getWidgets() {
             return multipleWidgets;
         }
     }
+
+
+    /**
+     * Assert proxy class cache growth for this test class.
+     * The (@link io.appium.java_client.proxy.Helpers#CACHED_PROXY_CLASSES) should be populated during these tests.
+     * Prior to the Caching issue being resolved
+     * - the CACHED_PROXY_CLASSES would grow indefinitely, resulting in an Out Of Memory exception.
+     * - this ParameterizedTest would have the CACHED_PROXY_CLASSES grow to 266 entries.
+     */
+    private void assertProxyClassCacheGrowth() {
+        System.gc(); //Trying to force a collection for more accurate check numbers
+        assertThat(
+            "Proxy Class Cache threshold is " + THRESHOLD_SIZE,
+            getCachedProxyClassesSize(),
+            lessThan(THRESHOLD_SIZE)
+        );
+    }
+
+    private int getCachedProxyClassesSize() {
+        try {
+            Field cpc = Class.forName("io.appium.java_client.proxy.Helpers").getDeclaredField("CACHED_PROXY_CLASSES");
+            cpc.setAccessible(true);
+            Map<?, ?> cachedProxyClasses = (Map<?, ?>) cpc.get(null);
+            return cachedProxyClasses.size();
+        } catch (NoSuchFieldException | ClassNotFoundException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }