diff --git a/samples/pagination/manual/app/build.gradle.kts b/samples/pagination/manual/app/build.gradle.kts
index bd972b46..a00c970f 100644
--- a/samples/pagination/manual/app/build.gradle.kts
+++ b/samples/pagination/manual/app/build.gradle.kts
@@ -7,7 +7,7 @@ fun prop(key: String) = project.findProperty(key).toString()
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
-    id("com.apollographql.apollo").version("4.2.0")
+    id("com.apollographql.apollo").version("4.3.0")
     id("org.jetbrains.kotlin.plugin.compose").version("2.1.10")
 }
 
@@ -33,7 +33,10 @@ android {
     buildTypes {
         release {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
 
@@ -62,7 +65,7 @@ apollo {
     service("main") {
         packageName.set("com.example.apollokotlinpaginationsample.graphql")
 
-        plugin("com.apollographql.cache:normalized-cache-apollo-compiler-plugin:1.0.0-alpha.2") {
+        plugin("com.apollographql.cache:normalized-cache-apollo-compiler-plugin:1.0.0-alpha.3") {
             argument("packageName", packageName.get())
         }
 
@@ -76,16 +79,16 @@ apollo {
 
 dependencies {
     implementation("androidx.core:core-ktx:1.16.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1")
     implementation("androidx.activity:activity-compose:1.10.1")
-    implementation(platform("androidx.compose:compose-bom:2025.05.00"))
+    implementation(platform("androidx.compose:compose-bom:2025.06.00"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material3:material3")
 
     implementation("com.apollographql.apollo:apollo-runtime")
-    implementation("com.apollographql.cache:normalized-cache-sqlite:1.0.0-alpha.2")
+    implementation("com.apollographql.cache:normalized-cache-sqlite:1.0.0-alpha.3")
 
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
diff --git a/samples/pagination/manual/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt b/samples/pagination/manual/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt
index 1dd0cb17..5a1ab3bc 100644
--- a/samples/pagination/manual/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt
+++ b/samples/pagination/manual/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt
@@ -4,6 +4,7 @@ import com.apollographql.apollo.ApolloClient
 import com.apollographql.apollo.api.Optional
 import com.apollographql.cache.normalized.FetchPolicy
 import com.apollographql.cache.normalized.api.CacheKey
+import com.apollographql.cache.normalized.api.TypePolicyCacheKeyGenerator
 import com.apollographql.cache.normalized.apolloStore
 import com.apollographql.cache.normalized.fetchPolicy
 import com.apollographql.cache.normalized.memory.MemoryCacheFactory
@@ -36,7 +37,7 @@ val apolloClient: ApolloClient by lazy {
         // Normalized cache
         .normalizedCache(
             memoryThenSqlCache,
-            cacheKeyGenerator = com.apollographql.cache.normalized.api.TypePolicyCacheKeyGenerator(
+            cacheKeyGenerator = TypePolicyCacheKeyGenerator(
                 typePolicies = Cache.typePolicies,
                 keyScope = CacheKey.Scope.SERVICE,
             ),
diff --git a/samples/pagination/pagination-support-with-jetpack-paging/app/build.gradle.kts b/samples/pagination/pagination-support-with-jetpack-paging/app/build.gradle.kts
index 2cca2dc3..c8e41fa6 100644
--- a/samples/pagination/pagination-support-with-jetpack-paging/app/build.gradle.kts
+++ b/samples/pagination/pagination-support-with-jetpack-paging/app/build.gradle.kts
@@ -7,7 +7,7 @@ fun prop(key: String) = project.findProperty(key).toString()
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
-    id("com.apollographql.apollo").version("4.2.0")
+    id("com.apollographql.apollo").version("4.3.0")
     id("org.jetbrains.kotlin.plugin.compose").version("2.1.10")
 }
 
@@ -33,7 +33,10 @@ android {
     buildTypes {
         release {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
 
@@ -62,7 +65,7 @@ apollo {
     service("main") {
         packageName.set("com.example.apollokotlinpaginationsample.graphql")
 
-        plugin("com.apollographql.cache:normalized-cache-apollo-compiler-plugin:1.0.0-alpha.2") {
+        plugin("com.apollographql.cache:normalized-cache-apollo-compiler-plugin:1.0.0-alpha.3") {
             argument("packageName", packageName.get())
         }
 
@@ -76,16 +79,16 @@ apollo {
 
 dependencies {
     implementation("androidx.core:core-ktx:1.16.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1")
     implementation("androidx.activity:activity-compose:1.10.1")
-    implementation(platform("androidx.compose:compose-bom:2025.05.00"))
+    implementation(platform("androidx.compose:compose-bom:2025.06.00"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material3:material3")
 
     implementation("com.apollographql.apollo:apollo-runtime")
-    implementation("com.apollographql.cache:normalized-cache-sqlite:1.0.0-alpha.2")
+    implementation("com.apollographql.cache:normalized-cache-sqlite:1.0.0-alpha.3")
 
     implementation("androidx.paging:paging-runtime-ktx:3.3.6")
     implementation("androidx.paging:paging-compose:3.3.6")
diff --git a/samples/pagination/pagination-support-with-jetpack-paging/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt b/samples/pagination/pagination-support-with-jetpack-paging/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt
index aaac57ad..89c2764d 100644
--- a/samples/pagination/pagination-support-with-jetpack-paging/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt
+++ b/samples/pagination/pagination-support-with-jetpack-paging/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt
@@ -14,6 +14,7 @@ import com.apollographql.cache.normalized.FetchPolicy
 import com.apollographql.cache.normalized.api.CacheKey
 import com.apollographql.cache.normalized.api.ConnectionMetadataGenerator
 import com.apollographql.cache.normalized.api.ConnectionRecordMerger
+import com.apollographql.cache.normalized.api.TypePolicyCacheKeyGenerator
 import com.apollographql.cache.normalized.fetchPolicy
 import com.apollographql.cache.normalized.memory.MemoryCacheFactory
 import com.apollographql.cache.normalized.normalizedCache
@@ -50,7 +51,7 @@ val apolloClient: ApolloClient by lazy {
         // Normalized cache
         .normalizedCache(
             normalizedCacheFactory = memoryThenSqlCache,
-            cacheKeyGenerator = com.apollographql.cache.normalized.api.TypePolicyCacheKeyGenerator(
+            cacheKeyGenerator = TypePolicyCacheKeyGenerator(
                 typePolicies = Cache.typePolicies,
                 keyScope = CacheKey.Scope.SERVICE,
             ),
diff --git a/samples/pagination/pagination-support/app/build.gradle.kts b/samples/pagination/pagination-support/app/build.gradle.kts
index bd972b46..a00c970f 100644
--- a/samples/pagination/pagination-support/app/build.gradle.kts
+++ b/samples/pagination/pagination-support/app/build.gradle.kts
@@ -7,7 +7,7 @@ fun prop(key: String) = project.findProperty(key).toString()
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
-    id("com.apollographql.apollo").version("4.2.0")
+    id("com.apollographql.apollo").version("4.3.0")
     id("org.jetbrains.kotlin.plugin.compose").version("2.1.10")
 }
 
@@ -33,7 +33,10 @@ android {
     buildTypes {
         release {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
 
@@ -62,7 +65,7 @@ apollo {
     service("main") {
         packageName.set("com.example.apollokotlinpaginationsample.graphql")
 
-        plugin("com.apollographql.cache:normalized-cache-apollo-compiler-plugin:1.0.0-alpha.2") {
+        plugin("com.apollographql.cache:normalized-cache-apollo-compiler-plugin:1.0.0-alpha.3") {
             argument("packageName", packageName.get())
         }
 
@@ -76,16 +79,16 @@ apollo {
 
 dependencies {
     implementation("androidx.core:core-ktx:1.16.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1")
     implementation("androidx.activity:activity-compose:1.10.1")
-    implementation(platform("androidx.compose:compose-bom:2025.05.00"))
+    implementation(platform("androidx.compose:compose-bom:2025.06.00"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material3:material3")
 
     implementation("com.apollographql.apollo:apollo-runtime")
-    implementation("com.apollographql.cache:normalized-cache-sqlite:1.0.0-alpha.2")
+    implementation("com.apollographql.cache:normalized-cache-sqlite:1.0.0-alpha.3")
 
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
diff --git a/samples/pagination/pagination-support/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt b/samples/pagination/pagination-support/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt
index 04b405a7..2adbdb13 100644
--- a/samples/pagination/pagination-support/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt
+++ b/samples/pagination/pagination-support/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt
@@ -6,6 +6,7 @@ import com.apollographql.cache.normalized.FetchPolicy
 import com.apollographql.cache.normalized.api.CacheKey
 import com.apollographql.cache.normalized.api.ConnectionMetadataGenerator
 import com.apollographql.cache.normalized.api.ConnectionRecordMerger
+import com.apollographql.cache.normalized.api.TypePolicyCacheKeyGenerator
 import com.apollographql.cache.normalized.fetchPolicy
 import com.apollographql.cache.normalized.memory.MemoryCacheFactory
 import com.apollographql.cache.normalized.normalizedCache
@@ -38,7 +39,7 @@ val apolloClient: ApolloClient by lazy {
         // Normalized cache
         .normalizedCache(
             normalizedCacheFactory = memoryThenSqlCache,
-            cacheKeyGenerator = com.apollographql.cache.normalized.api.TypePolicyCacheKeyGenerator(
+            cacheKeyGenerator = TypePolicyCacheKeyGenerator(
                 typePolicies = Cache.typePolicies,
                 keyScope = CacheKey.Scope.SERVICE,
             ),