diff --git a/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java b/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
index 18d055fcd..e7e5b332d 100644
--- a/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
@@ -21,6 +21,7 @@
 import java.beans.PropertyDescriptor;
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.WeakHashMap;
@@ -116,7 +117,7 @@ private WrapDynaClass(final Class<?> beanClass, final PropertyUtilsBean propUtil
         new ContextClassLoaderLocal<Map<CacheKey, WrapDynaClass>>() {
             @Override
                 protected Map<CacheKey, WrapDynaClass> initialValue() {
-                    return new WeakHashMap<>();
+                    return Collections.synchronizedMap(new WeakHashMap<>());
                 }
     };