diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/observability/CassandraObservation.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/observability/CassandraObservation.java
index 1d78fae70..0d15c1770 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/observability/CassandraObservation.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/observability/CassandraObservation.java
@@ -16,7 +16,7 @@
 package org.springframework.data.cassandra.observability;
 
 import io.micrometer.common.docs.KeyName;
-import io.micrometer.observation.docs.DocumentedObservation;
+import io.micrometer.observation.docs.ObservationDocumentation;
 
 /**
  * Cassandra-based implementation of {@link DocumentedObservation}.
@@ -26,7 +26,7 @@ import io.micrometer.observation.docs.DocumentedObservation;
  * @author Greg Turnquist
  * @since 4.0.0
  */
-enum CassandraObservation implements DocumentedObservation {
+enum CassandraObservation implements ObservationDocumentation {
 
 	/**
 	 * Create an {@link io.micrometer.observation.Observation} for Cassandra-based queries.
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/observability/CqlSessionTracingInterceptor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/observability/CqlSessionTracingInterceptor.java
index 1b469ef6f..62e9eb4a9 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/observability/CqlSessionTracingInterceptor.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/observability/CqlSessionTracingInterceptor.java
@@ -151,7 +151,7 @@ final class CqlSessionTracingInterceptor implements MethodInterceptor {
 		CqlSessionContext observationContext = new CqlSessionContext(statement, methodName, delegateSession);
 
 		return CassandraObservation.CASSANDRA_QUERY_OBSERVATION //
-				.observation(this.observationRegistry, observationContext) //
+				.observation(this.observationRegistry, () -> observationContext) //
 				.contextualName(CassandraObservation.CASSANDRA_QUERY_OBSERVATION.getContextualName()) //
 				.highCardinalityKeyValues(this.observationConvention.getHighCardinalityKeyValues(observationContext)) //
 				.lowCardinalityKeyValues(this.observationConvention.getLowCardinalityKeyValues(observationContext)) //