diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/MapBackedProvider.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/MapBackedProvider.java
index 557e2f0dfd..9a2f2df915 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/MapBackedProvider.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/context/MapBackedProvider.java
@@ -11,7 +11,6 @@ import datadog.trace.bootstrap.WeakMap;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
 import jdk.internal.org.objectweb.asm.ClassWriter;
 import lombok.extern.slf4j.Slf4j;
@@ -298,11 +297,7 @@ public class MapBackedProvider implements InstrumentationContextProvider {
           new HashMap<>(instrumenter.contextStore().size());
       for (final String keyClassName : instrumenter.contextStore().keySet()) {
         final String dynamicClassName =
-            instrumenter.getClass().getName()
-                + "$ContextStore"
-                + keyClassName.replaceAll(".*([^\\.]+)$", "\\1")
-                + UUID.randomUUID().toString().replace('-', '_');
-
+            getClass().getName() + "$ContextStore" + keyClassName.replaceAll("\\.", "\\$");
         dynamicClassNames.put(keyClassName, dynamicClassName);
         dynamicClasses.put(dynamicClassName, makeMapHolderClass(dynamicClassName));
       }