diff --git a/sentry-jcache/src/main/java/io/sentry/jcache/SentryJCacheWrapper.java b/sentry-jcache/src/main/java/io/sentry/jcache/SentryJCacheWrapper.java
index 5977dc10ad..3b3d1c4c2b 100644
--- a/sentry-jcache/src/main/java/io/sentry/jcache/SentryJCacheWrapper.java
+++ b/sentry-jcache/src/main/java/io/sentry/jcache/SentryJCacheWrapper.java
@@ -57,7 +57,7 @@ public V get(final K key) {
     }
     try {
       final V result = delegate.get(key);
-      span.setData(SpanDataConvention.CACHE_HIT_KEY, result != null);
+      span.setData(SpanDataConvention.CACHE_HIT, result != null);
       span.setStatus(SpanStatus.OK);
       return result;
     } catch (Throwable e) {
@@ -77,7 +77,7 @@ public Map<K, V> getAll(final Set<? extends K> keys) {
     }
     try {
       final Map<K, V> result = delegate.getAll(keys);
-      span.setData(SpanDataConvention.CACHE_HIT_KEY, !result.isEmpty());
+      span.setData(SpanDataConvention.CACHE_HIT, !result.isEmpty());
       span.setStatus(SpanStatus.OK);
       return result;
     } catch (Throwable e) {
@@ -497,9 +497,9 @@ public Iterator<Entry<K, V>> iterator() {
       return null;
     }
     if (cacheKeys != null) {
-      span.setData(SpanDataConvention.CACHE_KEY_KEY, cacheKeys);
+      span.setData(SpanDataConvention.CACHE_KEY, cacheKeys);
     }
-    span.setData(SpanDataConvention.CACHE_OPERATION_KEY, operationName);
+    span.setData(SpanDataConvention.CACHE_OPERATION, operationName);
     return span;
   }
 }
diff --git a/sentry-jcache/src/test/kotlin/io/sentry/jcache/SentryJCacheWrapperTest.kt b/sentry-jcache/src/test/kotlin/io/sentry/jcache/SentryJCacheWrapperTest.kt
index 220e75e413..8dfbada0a2 100644
--- a/sentry-jcache/src/test/kotlin/io/sentry/jcache/SentryJCacheWrapperTest.kt
+++ b/sentry-jcache/src/test/kotlin/io/sentry/jcache/SentryJCacheWrapperTest.kt
@@ -61,11 +61,11 @@ class SentryJCacheWrapperTest {
     assertEquals("cache.get", span.operation)
     assertEquals("myKey", span.description)
     assertEquals(SpanStatus.OK, span.status)
-    assertEquals(true, span.getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(true, span.getData(SpanDataConvention.CACHE_HIT))
     assertNull(span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY_KEY))
+    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY))
     assertEquals("auto.cache.jcache", span.spanContext.origin)
-    assertEquals("get", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("get", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   @Test
@@ -78,7 +78,7 @@ class SentryJCacheWrapperTest {
 
     assertNull(result)
     assertEquals(1, tx.spans.size)
-    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
   }
 
   // -- getAll --
@@ -98,10 +98,10 @@ class SentryJCacheWrapperTest {
     assertEquals("cache.getAll", span.operation)
     assertTrue(span.description!!.contains("k1"))
     assertTrue(span.description!!.contains("k2"))
-    assertEquals(true, span.getData(SpanDataConvention.CACHE_HIT_KEY))
-    val cacheKeys = span.getData(SpanDataConvention.CACHE_KEY_KEY) as List<*>
+    assertEquals(true, span.getData(SpanDataConvention.CACHE_HIT))
+    val cacheKeys = span.getData(SpanDataConvention.CACHE_KEY) as List<*>
     assertTrue(cacheKeys.containsAll(listOf("k1", "k2")))
-    assertEquals("getAll", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("getAll", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   @Test
@@ -113,7 +113,7 @@ class SentryJCacheWrapperTest {
 
     wrapper.getAll(keys)
 
-    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
   }
 
   // -- put --
@@ -131,8 +131,8 @@ class SentryJCacheWrapperTest {
     assertEquals("cache.put", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY_KEY))
-    assertEquals("put", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY))
+    assertEquals("put", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- getAndPut --
@@ -149,7 +149,7 @@ class SentryJCacheWrapperTest {
     assertEquals(1, tx.spans.size)
     assertEquals("cache.getAndPut", tx.spans.first().operation)
     assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("getAndPut", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("getAndPut", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- putAll --
@@ -169,9 +169,9 @@ class SentryJCacheWrapperTest {
     assertTrue(span.description!!.contains("k1"))
     assertTrue(span.description!!.contains("k2"))
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    val cacheKeys = span.getData(SpanDataConvention.CACHE_KEY_KEY) as List<*>
+    val cacheKeys = span.getData(SpanDataConvention.CACHE_KEY) as List<*>
     assertTrue(cacheKeys.containsAll(listOf("k1", "k2")))
-    assertEquals("putAll", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("putAll", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- putIfAbsent --
@@ -191,8 +191,8 @@ class SentryJCacheWrapperTest {
     assertEquals("cache.putIfAbsent", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY_KEY))
-    assertEquals("putIfAbsent", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY))
+    assertEquals("putIfAbsent", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- replace --
@@ -212,7 +212,7 @@ class SentryJCacheWrapperTest {
     assertEquals("cache.replace", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("replace", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("replace", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   @Test
@@ -230,7 +230,7 @@ class SentryJCacheWrapperTest {
     assertEquals("cache.replace", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("replace", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("replace", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- getAndReplace --
@@ -250,7 +250,7 @@ class SentryJCacheWrapperTest {
     assertEquals("cache.getAndReplace", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("getAndReplace", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("getAndReplace", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- remove(K) --
@@ -269,7 +269,7 @@ class SentryJCacheWrapperTest {
     assertEquals("cache.remove", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("remove", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("remove", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- remove(K, V) --
@@ -286,7 +286,7 @@ class SentryJCacheWrapperTest {
     assertEquals(1, tx.spans.size)
     assertEquals("cache.remove", tx.spans.first().operation)
     assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("remove", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("remove", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- getAndRemove --
@@ -303,7 +303,7 @@ class SentryJCacheWrapperTest {
     assertEquals(1, tx.spans.size)
     assertEquals("cache.getAndRemove", tx.spans.first().operation)
     assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("getAndRemove", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("getAndRemove", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- removeAll(Set) --
@@ -323,7 +323,7 @@ class SentryJCacheWrapperTest {
     assertTrue(span.description!!.contains("k1"))
     assertTrue(span.description!!.contains("k2"))
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("removeAll", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("removeAll", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- removeAll() --
@@ -339,7 +339,7 @@ class SentryJCacheWrapperTest {
     assertEquals(1, tx.spans.size)
     assertEquals("cache.removeAll", tx.spans.first().operation)
     assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("removeAll", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("removeAll", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- clear --
@@ -357,8 +357,8 @@ class SentryJCacheWrapperTest {
     assertEquals("cache.clear", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertNull(span.getData(SpanDataConvention.CACHE_KEY_KEY))
-    assertEquals("clear", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertNull(span.getData(SpanDataConvention.CACHE_KEY))
+    assertEquals("clear", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- invoke --
@@ -375,7 +375,7 @@ class SentryJCacheWrapperTest {
     assertEquals("result", result)
     assertEquals(1, tx.spans.size)
     assertEquals("cache.invoke", tx.spans.first().operation)
-    assertEquals("invoke", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("invoke", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- invokeAll --
@@ -394,7 +394,7 @@ class SentryJCacheWrapperTest {
     assertEquals(resultMap, result)
     assertEquals(1, tx.spans.size)
     assertEquals("cache.invokeAll", tx.spans.first().operation)
-    assertEquals("invokeAll", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("invokeAll", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- passthrough operations --
diff --git a/sentry-spring-7/src/main/java/io/sentry/spring7/cache/SentryCacheWrapper.java b/sentry-spring-7/src/main/java/io/sentry/spring7/cache/SentryCacheWrapper.java
index 38ff9b7d4d..1d881afaf7 100644
--- a/sentry-spring-7/src/main/java/io/sentry/spring7/cache/SentryCacheWrapper.java
+++ b/sentry-spring-7/src/main/java/io/sentry/spring7/cache/SentryCacheWrapper.java
@@ -47,7 +47,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
     }
     try {
       final ValueWrapper result = delegate.get(key);
-      span.setData(SpanDataConvention.CACHE_HIT_KEY, result != null);
+      span.setData(SpanDataConvention.CACHE_HIT, result != null);
       span.setStatus(SpanStatus.OK);
       return result;
     } catch (Throwable e) {
@@ -67,7 +67,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
     }
     try {
       final ValueWrapper wrapper = delegate.get(key);
-      span.setData(SpanDataConvention.CACHE_HIT_KEY, wrapper != null);
+      span.setData(SpanDataConvention.CACHE_HIT, wrapper != null);
       final T result = delegate.get(key, type);
       span.setStatus(SpanStatus.OK);
       return result;
@@ -95,7 +95,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
                 loaderInvoked.set(true);
                 return valueLoader.call();
               });
-      span.setData(SpanDataConvention.CACHE_HIT_KEY, !loaderInvoked.get());
+      span.setData(SpanDataConvention.CACHE_HIT, !loaderInvoked.get());
       span.setData(SpanDataConvention.CACHE_WRITE, loaderInvoked.get());
       span.setStatus(SpanStatus.OK);
       return result;
@@ -124,7 +124,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
       throw e;
     }
     if (result == null) {
-      span.setData(SpanDataConvention.CACHE_HIT_KEY, false);
+      span.setData(SpanDataConvention.CACHE_HIT, false);
       span.setStatus(SpanStatus.OK);
       span.finish();
       return null;
@@ -135,7 +135,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
             span.setStatus(SpanStatus.INTERNAL_ERROR);
             span.setThrowable(throwable);
           } else {
-            span.setData(SpanDataConvention.CACHE_HIT_KEY, value != null);
+            span.setData(SpanDataConvention.CACHE_HIT, value != null);
             span.setStatus(SpanStatus.OK);
           }
           span.finish();
@@ -171,7 +171,7 @@ public <T> CompletableFuture<T> retrieve(
             span.setStatus(SpanStatus.INTERNAL_ERROR);
             span.setThrowable(throwable);
           } else {
-            span.setData(SpanDataConvention.CACHE_HIT_KEY, !loaderInvoked.get());
+            span.setData(SpanDataConvention.CACHE_HIT, !loaderInvoked.get());
             span.setData(SpanDataConvention.CACHE_WRITE, loaderInvoked.get());
             span.setStatus(SpanStatus.OK);
           }
@@ -319,9 +319,9 @@ public boolean invalidate() {
       return null;
     }
     if (keyString != null) {
-      span.setData(SpanDataConvention.CACHE_KEY_KEY, Arrays.asList(keyString));
+      span.setData(SpanDataConvention.CACHE_KEY, Arrays.asList(keyString));
     }
-    span.setData(SpanDataConvention.CACHE_OPERATION_KEY, operationName);
+    span.setData(SpanDataConvention.CACHE_OPERATION, operationName);
     return span;
   }
 }
diff --git a/sentry-spring-7/src/test/kotlin/io/sentry/spring7/cache/SentryCacheWrapperTest.kt b/sentry-spring-7/src/test/kotlin/io/sentry/spring7/cache/SentryCacheWrapperTest.kt
index 8f3867dd50..8d38e93c4e 100644
--- a/sentry-spring-7/src/test/kotlin/io/sentry/spring7/cache/SentryCacheWrapperTest.kt
+++ b/sentry-spring-7/src/test/kotlin/io/sentry/spring7/cache/SentryCacheWrapperTest.kt
@@ -60,11 +60,11 @@ class SentryCacheWrapperTest {
     assertEquals("cache.get", span.operation)
     assertEquals("myKey", span.description)
     assertEquals(SpanStatus.OK, span.status)
-    assertEquals(true, span.getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(true, span.getData(SpanDataConvention.CACHE_HIT))
     assertNull(span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY_KEY))
+    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY))
     assertEquals("auto.cache.spring", span.spanContext.origin)
-    assertEquals("get", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("get", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   @Test
@@ -77,7 +77,7 @@ class SentryCacheWrapperTest {
 
     assertNull(result)
     assertEquals(1, tx.spans.size)
-    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
   }
 
   // -- get(Object key, Class<T>) --
@@ -94,7 +94,7 @@ class SentryCacheWrapperTest {
 
     assertEquals("value", result)
     assertEquals(1, tx.spans.size)
-    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
   }
 
   @Test
@@ -109,7 +109,7 @@ class SentryCacheWrapperTest {
 
     assertNull(result)
     assertEquals(1, tx.spans.size)
-    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
   }
 
   @Test
@@ -123,7 +123,7 @@ class SentryCacheWrapperTest {
 
     assertNull(result)
     assertEquals(1, tx.spans.size)
-    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
   }
 
   @Test
@@ -155,7 +155,7 @@ class SentryCacheWrapperTest {
 
     assertEquals("cached", result)
     assertEquals(1, tx.spans.size)
-    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
     assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
   }
 
@@ -173,7 +173,7 @@ class SentryCacheWrapperTest {
 
     assertEquals("loaded", result)
     assertEquals(1, tx.spans.size)
-    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
     assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
   }
 
@@ -193,9 +193,9 @@ class SentryCacheWrapperTest {
     assertEquals("cache.retrieve", span.operation)
     assertEquals("myKey", span.description)
     assertEquals(SpanStatus.OK, span.status)
-    assertEquals(true, span.getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(true, span.getData(SpanDataConvention.CACHE_HIT))
     assertNull(span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("retrieve", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("retrieve", span.getData(SpanDataConvention.CACHE_OPERATION))
     assertTrue(span.isFinished)
   }
 
@@ -209,7 +209,7 @@ class SentryCacheWrapperTest {
 
     assertNull(result!!.get())
     assertEquals(1, tx.spans.size)
-    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
     assertTrue(tx.spans.first().isFinished)
   }
 
@@ -224,7 +224,7 @@ class SentryCacheWrapperTest {
     assertNull(result)
     assertEquals(1, tx.spans.size)
     val span = tx.spans.first()
-    assertEquals(false, span.getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(false, span.getData(SpanDataConvention.CACHE_HIT))
     assertEquals(SpanStatus.OK, span.status)
     assertTrue(span.isFinished)
   }
@@ -290,7 +290,7 @@ class SentryCacheWrapperTest {
 
     assertEquals("cached", result.get())
     assertEquals(1, tx.spans.size)
-    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
     assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
     assertTrue(tx.spans.first().isFinished)
   }
@@ -310,7 +310,7 @@ class SentryCacheWrapperTest {
 
     assertEquals("loaded", result.get())
     assertEquals(1, tx.spans.size)
-    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
     assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
     assertTrue(tx.spans.first().isFinished)
   }
@@ -362,8 +362,8 @@ class SentryCacheWrapperTest {
     assertEquals("cache.put", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY_KEY))
-    assertEquals("put", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY))
+    assertEquals("put", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- putIfAbsent --
@@ -383,8 +383,8 @@ class SentryCacheWrapperTest {
     assertEquals("cache.putIfAbsent", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY_KEY))
-    assertEquals("putIfAbsent", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY))
+    assertEquals("putIfAbsent", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- evict --
@@ -402,7 +402,7 @@ class SentryCacheWrapperTest {
     assertEquals("cache.evict", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("evict", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("evict", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- evictIfPresent --
@@ -419,7 +419,7 @@ class SentryCacheWrapperTest {
     assertEquals(1, tx.spans.size)
     assertEquals("cache.evictIfPresent", tx.spans.first().operation)
     assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("evictIfPresent", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("evictIfPresent", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- clear --
@@ -437,8 +437,8 @@ class SentryCacheWrapperTest {
     assertEquals("cache.clear", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertNull(span.getData(SpanDataConvention.CACHE_KEY_KEY))
-    assertEquals("clear", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertNull(span.getData(SpanDataConvention.CACHE_KEY))
+    assertEquals("clear", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- invalidate --
@@ -455,7 +455,7 @@ class SentryCacheWrapperTest {
     assertEquals(1, tx.spans.size)
     assertEquals("cache.invalidate", tx.spans.first().operation)
     assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("invalidate", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("invalidate", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- no span when no active transaction --
diff --git a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/cache/SentryCacheWrapper.java b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/cache/SentryCacheWrapper.java
index 61405c0276..961d08f042 100644
--- a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/cache/SentryCacheWrapper.java
+++ b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/cache/SentryCacheWrapper.java
@@ -47,7 +47,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
     }
     try {
       final ValueWrapper result = delegate.get(key);
-      span.setData(SpanDataConvention.CACHE_HIT_KEY, result != null);
+      span.setData(SpanDataConvention.CACHE_HIT, result != null);
       span.setStatus(SpanStatus.OK);
       return result;
     } catch (Throwable e) {
@@ -67,7 +67,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
     }
     try {
       final ValueWrapper wrapper = delegate.get(key);
-      span.setData(SpanDataConvention.CACHE_HIT_KEY, wrapper != null);
+      span.setData(SpanDataConvention.CACHE_HIT, wrapper != null);
       final T result = delegate.get(key, type);
       span.setStatus(SpanStatus.OK);
       return result;
@@ -95,7 +95,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
                 loaderInvoked.set(true);
                 return valueLoader.call();
               });
-      span.setData(SpanDataConvention.CACHE_HIT_KEY, !loaderInvoked.get());
+      span.setData(SpanDataConvention.CACHE_HIT, !loaderInvoked.get());
       span.setData(SpanDataConvention.CACHE_WRITE, loaderInvoked.get());
       span.setStatus(SpanStatus.OK);
       return result;
@@ -124,7 +124,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
       throw e;
     }
     if (result == null) {
-      span.setData(SpanDataConvention.CACHE_HIT_KEY, false);
+      span.setData(SpanDataConvention.CACHE_HIT, false);
       span.setStatus(SpanStatus.OK);
       span.finish();
       return null;
@@ -135,7 +135,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
             span.setStatus(SpanStatus.INTERNAL_ERROR);
             span.setThrowable(throwable);
           } else {
-            span.setData(SpanDataConvention.CACHE_HIT_KEY, value != null);
+            span.setData(SpanDataConvention.CACHE_HIT, value != null);
             span.setStatus(SpanStatus.OK);
           }
           span.finish();
@@ -171,7 +171,7 @@ public <T> CompletableFuture<T> retrieve(
             span.setStatus(SpanStatus.INTERNAL_ERROR);
             span.setThrowable(throwable);
           } else {
-            span.setData(SpanDataConvention.CACHE_HIT_KEY, !loaderInvoked.get());
+            span.setData(SpanDataConvention.CACHE_HIT, !loaderInvoked.get());
             span.setData(SpanDataConvention.CACHE_WRITE, loaderInvoked.get());
             span.setStatus(SpanStatus.OK);
           }
@@ -319,9 +319,9 @@ public boolean invalidate() {
       return null;
     }
     if (keyString != null) {
-      span.setData(SpanDataConvention.CACHE_KEY_KEY, Arrays.asList(keyString));
+      span.setData(SpanDataConvention.CACHE_KEY, Arrays.asList(keyString));
     }
-    span.setData(SpanDataConvention.CACHE_OPERATION_KEY, operationName);
+    span.setData(SpanDataConvention.CACHE_OPERATION, operationName);
     return span;
   }
 }
diff --git a/sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/cache/SentryCacheWrapperTest.kt b/sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/cache/SentryCacheWrapperTest.kt
index d366e7574f..fae2e9dce5 100644
--- a/sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/cache/SentryCacheWrapperTest.kt
+++ b/sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/cache/SentryCacheWrapperTest.kt
@@ -60,11 +60,11 @@ class SentryCacheWrapperTest {
     assertEquals("cache.get", span.operation)
     assertEquals("myKey", span.description)
     assertEquals(SpanStatus.OK, span.status)
-    assertEquals(true, span.getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(true, span.getData(SpanDataConvention.CACHE_HIT))
     assertNull(span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY_KEY))
+    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY))
     assertEquals("auto.cache.spring", span.spanContext.origin)
-    assertEquals("get", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("get", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   @Test
@@ -77,7 +77,7 @@ class SentryCacheWrapperTest {
 
     assertNull(result)
     assertEquals(1, tx.spans.size)
-    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
   }
 
   // -- get(Object key, Class<T>) --
@@ -94,7 +94,7 @@ class SentryCacheWrapperTest {
 
     assertEquals("value", result)
     assertEquals(1, tx.spans.size)
-    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
   }
 
   @Test
@@ -109,7 +109,7 @@ class SentryCacheWrapperTest {
 
     assertNull(result)
     assertEquals(1, tx.spans.size)
-    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
   }
 
   @Test
@@ -123,7 +123,7 @@ class SentryCacheWrapperTest {
 
     assertNull(result)
     assertEquals(1, tx.spans.size)
-    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
   }
 
   @Test
@@ -155,7 +155,7 @@ class SentryCacheWrapperTest {
 
     assertEquals("cached", result)
     assertEquals(1, tx.spans.size)
-    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
     assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
   }
 
@@ -173,7 +173,7 @@ class SentryCacheWrapperTest {
 
     assertEquals("loaded", result)
     assertEquals(1, tx.spans.size)
-    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
     assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
   }
 
@@ -193,9 +193,9 @@ class SentryCacheWrapperTest {
     assertEquals("cache.retrieve", span.operation)
     assertEquals("myKey", span.description)
     assertEquals(SpanStatus.OK, span.status)
-    assertEquals(true, span.getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(true, span.getData(SpanDataConvention.CACHE_HIT))
     assertNull(span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("retrieve", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("retrieve", span.getData(SpanDataConvention.CACHE_OPERATION))
     assertTrue(span.isFinished)
   }
 
@@ -209,7 +209,7 @@ class SentryCacheWrapperTest {
 
     assertNull(result!!.get())
     assertEquals(1, tx.spans.size)
-    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
     assertTrue(tx.spans.first().isFinished)
   }
 
@@ -224,7 +224,7 @@ class SentryCacheWrapperTest {
     assertNull(result)
     assertEquals(1, tx.spans.size)
     val span = tx.spans.first()
-    assertEquals(false, span.getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(false, span.getData(SpanDataConvention.CACHE_HIT))
     assertEquals(SpanStatus.OK, span.status)
     assertTrue(span.isFinished)
   }
@@ -290,7 +290,7 @@ class SentryCacheWrapperTest {
 
     assertEquals("cached", result.get())
     assertEquals(1, tx.spans.size)
-    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
     assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
     assertTrue(tx.spans.first().isFinished)
   }
@@ -310,7 +310,7 @@ class SentryCacheWrapperTest {
 
     assertEquals("loaded", result.get())
     assertEquals(1, tx.spans.size)
-    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
     assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
     assertTrue(tx.spans.first().isFinished)
   }
@@ -362,8 +362,8 @@ class SentryCacheWrapperTest {
     assertEquals("cache.put", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY_KEY))
-    assertEquals("put", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY))
+    assertEquals("put", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- putIfAbsent --
@@ -383,8 +383,8 @@ class SentryCacheWrapperTest {
     assertEquals("cache.putIfAbsent", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY_KEY))
-    assertEquals("putIfAbsent", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY))
+    assertEquals("putIfAbsent", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- evict --
@@ -402,7 +402,7 @@ class SentryCacheWrapperTest {
     assertEquals("cache.evict", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("evict", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("evict", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- evictIfPresent --
@@ -419,7 +419,7 @@ class SentryCacheWrapperTest {
     assertEquals(1, tx.spans.size)
     assertEquals("cache.evictIfPresent", tx.spans.first().operation)
     assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("evictIfPresent", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("evictIfPresent", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- clear --
@@ -437,8 +437,8 @@ class SentryCacheWrapperTest {
     assertEquals("cache.clear", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertNull(span.getData(SpanDataConvention.CACHE_KEY_KEY))
-    assertEquals("clear", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertNull(span.getData(SpanDataConvention.CACHE_KEY))
+    assertEquals("clear", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- invalidate --
@@ -455,7 +455,7 @@ class SentryCacheWrapperTest {
     assertEquals(1, tx.spans.size)
     assertEquals("cache.invalidate", tx.spans.first().operation)
     assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("invalidate", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("invalidate", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- no span when no active transaction --
diff --git a/sentry-spring/src/main/java/io/sentry/spring/cache/SentryCacheWrapper.java b/sentry-spring/src/main/java/io/sentry/spring/cache/SentryCacheWrapper.java
index e4deceae29..ab8692afc3 100644
--- a/sentry-spring/src/main/java/io/sentry/spring/cache/SentryCacheWrapper.java
+++ b/sentry-spring/src/main/java/io/sentry/spring/cache/SentryCacheWrapper.java
@@ -45,7 +45,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
     }
     try {
       final ValueWrapper result = delegate.get(key);
-      span.setData(SpanDataConvention.CACHE_HIT_KEY, result != null);
+      span.setData(SpanDataConvention.CACHE_HIT, result != null);
       span.setStatus(SpanStatus.OK);
       return result;
     } catch (Throwable e) {
@@ -65,7 +65,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
     }
     try {
       final ValueWrapper wrapper = delegate.get(key);
-      span.setData(SpanDataConvention.CACHE_HIT_KEY, wrapper != null);
+      span.setData(SpanDataConvention.CACHE_HIT, wrapper != null);
       final T result = delegate.get(key, type);
       span.setStatus(SpanStatus.OK);
       return result;
@@ -93,7 +93,7 @@ public SentryCacheWrapper(final @NotNull Cache delegate, final @NotNull IScopes
                 loaderInvoked.set(true);
                 return valueLoader.call();
               });
-      span.setData(SpanDataConvention.CACHE_HIT_KEY, !loaderInvoked.get());
+      span.setData(SpanDataConvention.CACHE_HIT, !loaderInvoked.get());
       span.setData(SpanDataConvention.CACHE_WRITE, loaderInvoked.get());
       span.setStatus(SpanStatus.OK);
       return result;
@@ -246,9 +246,9 @@ public boolean invalidate() {
       return null;
     }
     if (keyString != null) {
-      span.setData(SpanDataConvention.CACHE_KEY_KEY, Arrays.asList(keyString));
+      span.setData(SpanDataConvention.CACHE_KEY, Arrays.asList(keyString));
     }
-    span.setData(SpanDataConvention.CACHE_OPERATION_KEY, operationName);
+    span.setData(SpanDataConvention.CACHE_OPERATION, operationName);
     return span;
   }
 }
diff --git a/sentry-spring/src/test/kotlin/io/sentry/spring/cache/SentryCacheWrapperTest.kt b/sentry-spring/src/test/kotlin/io/sentry/spring/cache/SentryCacheWrapperTest.kt
index 11e078e86f..4f40886c41 100644
--- a/sentry-spring/src/test/kotlin/io/sentry/spring/cache/SentryCacheWrapperTest.kt
+++ b/sentry-spring/src/test/kotlin/io/sentry/spring/cache/SentryCacheWrapperTest.kt
@@ -58,11 +58,11 @@ class SentryCacheWrapperTest {
     assertEquals("cache.get", span.operation)
     assertEquals("myKey", span.description)
     assertEquals(SpanStatus.OK, span.status)
-    assertEquals(true, span.getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(true, span.getData(SpanDataConvention.CACHE_HIT))
     assertNull(span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY_KEY))
+    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY))
     assertEquals("auto.cache.spring", span.spanContext.origin)
-    assertEquals("get", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("get", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   @Test
@@ -75,7 +75,7 @@ class SentryCacheWrapperTest {
 
     assertNull(result)
     assertEquals(1, tx.spans.size)
-    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
   }
 
   // -- get(Object key, Class<T>) --
@@ -92,7 +92,7 @@ class SentryCacheWrapperTest {
 
     assertEquals("value", result)
     assertEquals(1, tx.spans.size)
-    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
   }
 
   @Test
@@ -107,7 +107,7 @@ class SentryCacheWrapperTest {
 
     assertNull(result)
     assertEquals(1, tx.spans.size)
-    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
   }
 
   @Test
@@ -121,7 +121,7 @@ class SentryCacheWrapperTest {
 
     assertNull(result)
     assertEquals(1, tx.spans.size)
-    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
   }
 
   @Test
@@ -153,7 +153,7 @@ class SentryCacheWrapperTest {
 
     assertEquals("cached", result)
     assertEquals(1, tx.spans.size)
-    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
     assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
   }
 
@@ -171,7 +171,7 @@ class SentryCacheWrapperTest {
 
     assertEquals("loaded", result)
     assertEquals(1, tx.spans.size)
-    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT_KEY))
+    assertEquals(false, tx.spans.first().getData(SpanDataConvention.CACHE_HIT))
     assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
   }
 
@@ -190,8 +190,8 @@ class SentryCacheWrapperTest {
     assertEquals("cache.put", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY_KEY))
-    assertEquals("put", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY))
+    assertEquals("put", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- putIfAbsent --
@@ -211,8 +211,8 @@ class SentryCacheWrapperTest {
     assertEquals("cache.putIfAbsent", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY_KEY))
-    assertEquals("putIfAbsent", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals(listOf("myKey"), span.getData(SpanDataConvention.CACHE_KEY))
+    assertEquals("putIfAbsent", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- evict --
@@ -230,7 +230,7 @@ class SentryCacheWrapperTest {
     assertEquals("cache.evict", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("evict", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("evict", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- evictIfPresent --
@@ -247,7 +247,7 @@ class SentryCacheWrapperTest {
     assertEquals(1, tx.spans.size)
     assertEquals("cache.evictIfPresent", tx.spans.first().operation)
     assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("evictIfPresent", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("evictIfPresent", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- clear --
@@ -265,8 +265,8 @@ class SentryCacheWrapperTest {
     assertEquals("cache.clear", span.operation)
     assertEquals(SpanStatus.OK, span.status)
     assertEquals(true, span.getData(SpanDataConvention.CACHE_WRITE))
-    assertNull(span.getData(SpanDataConvention.CACHE_KEY_KEY))
-    assertEquals("clear", span.getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertNull(span.getData(SpanDataConvention.CACHE_KEY))
+    assertEquals("clear", span.getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- invalidate --
@@ -283,7 +283,7 @@ class SentryCacheWrapperTest {
     assertEquals(1, tx.spans.size)
     assertEquals("cache.invalidate", tx.spans.first().operation)
     assertEquals(true, tx.spans.first().getData(SpanDataConvention.CACHE_WRITE))
-    assertEquals("invalidate", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION_KEY))
+    assertEquals("invalidate", tx.spans.first().getData(SpanDataConvention.CACHE_OPERATION))
   }
 
   // -- no span when no active transaction --
diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
index c9d3da2f44..6fa2cb29df 100644
--- a/sentry/api/sentry.api
+++ b/sentry/api/sentry.api
@@ -4342,9 +4342,9 @@ public final class io/sentry/SpanContext$JsonKeys {
 
 public abstract interface class io/sentry/SpanDataConvention {
 	public static final field BLOCKED_MAIN_THREAD_KEY Ljava/lang/String;
-	public static final field CACHE_HIT_KEY Ljava/lang/String;
-	public static final field CACHE_KEY_KEY Ljava/lang/String;
-	public static final field CACHE_OPERATION_KEY Ljava/lang/String;
+	public static final field CACHE_HIT Ljava/lang/String;
+	public static final field CACHE_KEY Ljava/lang/String;
+	public static final field CACHE_OPERATION Ljava/lang/String;
 	public static final field CACHE_WRITE Ljava/lang/String;
 	public static final field CALL_STACK_KEY Ljava/lang/String;
 	public static final field CONTRIBUTES_TTFD Ljava/lang/String;
diff --git a/sentry/src/main/java/io/sentry/SpanDataConvention.java b/sentry/src/main/java/io/sentry/SpanDataConvention.java
index cbb6d0ceb7..647c0dacdd 100644
--- a/sentry/src/main/java/io/sentry/SpanDataConvention.java
+++ b/sentry/src/main/java/io/sentry/SpanDataConvention.java
@@ -26,8 +26,8 @@ public interface SpanDataConvention {
   String HTTP_START_TIMESTAMP = "http.start_timestamp";
   String HTTP_END_TIMESTAMP = "http.end_timestamp";
   String PROFILER_ID = "profiler_id";
-  String CACHE_HIT_KEY = "cache.hit";
-  String CACHE_KEY_KEY = "cache.key";
-  String CACHE_OPERATION_KEY = "cache.operation";
+  String CACHE_HIT = "cache.hit";
+  String CACHE_KEY = "cache.key";
+  String CACHE_OPERATION = "cache.operation";
   String CACHE_WRITE = "cache.write";
 }