diff --git a/utils/src/main/java/datadog/instrument/utils/ClassNameTrie.java b/utils/src/main/java/datadog/instrument/utils/ClassNameTrie.java
index 58c8e1c..3d205fa 100644
--- a/utils/src/main/java/datadog/instrument/utils/ClassNameTrie.java
+++ b/utils/src/main/java/datadog/instrument/utils/ClassNameTrie.java
@@ -290,6 +290,7 @@ public static class Builder {
     private int trieLength;
     private int[] longJumps;
     private int longJumpCount;
+    private boolean shared; // trieData and longJumps are shared with an immutable trie
 
     private int[] jumpIndexes;
     private int jumpIndexCount;
@@ -308,6 +309,7 @@ public Builder(ClassNameTrie trie) {
         trieLength = trieData.length;
         longJumps = trie.longJumps;
         longJumpCount = longJumps != null ? longJumps.length : 0;
+        shared = true;
       }
     }
 
@@ -342,6 +344,7 @@ public ClassNameTrie buildTrie() {
       if (longJumps != null && longJumps.length > longJumpCount) {
         longJumps = Arrays.copyOfRange(longJumps, 0, longJumpCount);
       }
+      shared = true;
       return new ClassNameTrie(trieData, longJumps);
     }
 
@@ -442,6 +445,13 @@ public void put(String className, int number) {
     }
 
     private void insertMapping(String key, char valueToInsert) {
+      if (shared) {
+        trieData = trieData.clone();
+        if (longJumps != null) {
+          longJumps = longJumps.clone();
+        }
+        shared = false;
+      }
       jumpIndexCount = 0;
 
       int keyLength = key.length();
diff --git a/utils/src/test/java/datadog/instrument/utils/ClassNameTrieTest.java b/utils/src/test/java/datadog/instrument/utils/ClassNameTrieTest.java
index 23655a2..ab86205 100644
--- a/utils/src/test/java/datadog/instrument/utils/ClassNameTrieTest.java
+++ b/utils/src/test/java/datadog/instrument/utils/ClassNameTrieTest.java
@@ -263,6 +263,63 @@ void tooManyLongJumps() {
         IllegalArgumentException.class, () -> builder.put("" + ((char) 67) + ((char) 2), 1));
   }
 
+  @ParameterizedTest
+  @ValueSource(booleans = {false, true})
+  void builtTriePreservesValuesAfterBuilderUpdates(boolean newBuilder) {
+    ClassNameTrie.Builder builder = new ClassNameTrie.Builder();
+    builder.put("a", 1);
+    ClassNameTrie original = builder.buildTrie();
+    if (newBuilder) {
+      builder = new ClassNameTrie.Builder(original);
+    }
+
+    builder.put("a", 2);
+    ClassNameTrie updated = builder.buildTrie();
+    builder.put("a", 3);
+    builder.put("ab", 4);
+
+    assertEquals(1, original.apply("a"));
+    assertEquals(-1, original.apply("ab"));
+    assertEquals(2, updated.apply("a"));
+    assertEquals(-1, updated.apply("ab"));
+    assertEquals(3, builder.apply("a"));
+    assertEquals(4, builder.apply("ab"));
+  }
+
+  @ParameterizedTest
+  @ValueSource(booleans = {false, true})
+  void builtTriePreservesLongJumpsAfterBuilderUpdates(boolean newBuilder) {
+    ClassNameTrie.Builder builder = new ClassNameTrie.Builder();
+    String padding = padding(7700);
+    for (char branch = 'a'; branch <= 'h'; branch++) {
+      builder.put("aa" + branch + padding, 1);
+    }
+    builder.put("abx", 2);
+    ClassNameTrie original = builder.buildTrie();
+    if (newBuilder) {
+      builder = new ClassNameTrie.Builder(original);
+    }
+
+    String extension = "aaa" + padding + "x";
+    builder.put(extension, 3); // shifts the existing long jump to 'abx'
+    ClassNameTrie updated = builder.buildTrie();
+    builder.put(extension + "x", 4); // shifts it again after another build
+
+    assertEquals(2, original.apply("abx"));
+    assertEquals(2, updated.apply("abx"));
+    assertEquals(2, builder.apply("abx"));
+    for (char branch = 'a'; branch <= 'h'; branch++) {
+      assertEquals(1, original.apply("aa" + branch + padding));
+      assertEquals(1, updated.apply("aa" + branch + padding));
+      assertEquals(1, builder.apply("aa" + branch + padding));
+    }
+    assertEquals(-1, original.apply(extension));
+    assertEquals(3, updated.apply(extension));
+    assertEquals(-1, updated.apply(extension + "x"));
+    assertEquals(3, builder.apply(extension));
+    assertEquals(4, builder.apply(extension + "x"));
+  }
+
   @ParameterizedTest
   @ValueSource(booleans = {false, true})
   void growsLongJumpTableAfterCompaction(boolean newBuilder) {