diff --git a/README.md b/README.md
index 352a53ac..b7aeae93 100644
--- a/README.md
+++ b/README.md
@@ -24,3 +24,13 @@ See the project website for documentation:<br/>
 
 The Kdoc API reference can be found at:<br/>
 [https://apollographql.github.io/apollo-kotlin-normalized-cache-incubating/kdoc](https://apollographql.github.io/apollo-kotlin-normalized-cache-incubating/kdoc)
+
+## ⚠️ Disclaimer
+
+The incubating version of the normalized cache is not stable and is subject to change. It is recommended to experiment with it in
+non-critical projects/modules, or behind a feature flag.
+
+In particular,
+
+- there are no guarantees about the format of the cached data, so you should assume that it may be lost when upgrading
+- performance and size may not be optimal
diff --git a/Writerside/topics/welcome.md b/Writerside/topics/welcome.md
index 89b410bc..c13185fc 100644
--- a/Writerside/topics/welcome.md
+++ b/Writerside/topics/welcome.md
@@ -6,6 +6,11 @@ This repository serves as a place to experiment with [Apollo Kotlin](https://git
 
 > The incubating version of the normalized cache is not stable and is subject to change. It is recommended to experiment with it in
 > non-critical projects/modules, or behind a feature flag.
+>
+> In particular,
+> - there are no guarantees about the format of the cached data, so you should assume that it may be lost when upgrading
+> - performance and size may not be optimal
+
 {style="warning"}
 
 Add the dependencies to your project.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 83becec3..4b1acf41 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 kotlin-plugin = "2.0.21"
 android-plugin = "8.7.0"
-apollo = "4.0.2-SNAPSHOT"
+apollo = "4.1.0"
 okio = "3.9.0"
 atomicfu = "0.23.1" # Must be the same version as the one used by apollo-testing-support or native compilation will fail
 sqldelight = "2.0.1"
@@ -42,4 +42,3 @@ librarian = { id = "com.gradleup.librarian", version.ref = "librarian" }
 atomicfu = { id = "org.jetbrains.kotlin.plugin.atomicfu", version.ref = "kotlin-plugin" }
 sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
 apollo = { id = "com.apollographql.apollo", version.ref = "apollo" }
-apollo-external = { id = "com.apollographql.apollo.external", version.ref = "apollo" }
diff --git a/gradle/repositories.gradle.kts b/gradle/repositories.gradle.kts
index 213c3c1b..3e713e46 100644
--- a/gradle/repositories.gradle.kts
+++ b/gradle/repositories.gradle.kts
@@ -1,8 +1,8 @@
 listOf(pluginManagement.repositories, dependencyResolutionManagement.repositories).forEach {
   it.apply {
-    maven {
-      url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-    }
+//    maven {
+//      url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+//    }
     mavenCentral()
     google()
     gradlePluginPortal()
diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts
index a1c8bf18..1fc20c40 100644
--- a/tests/build.gradle.kts
+++ b/tests/build.gradle.kts
@@ -3,5 +3,4 @@ plugins {
 
   alias(libs.plugins.kotlin.multiplatform).apply(false)
   alias(libs.plugins.apollo).apply(false)
-  alias(libs.plugins.apollo.external).apply(false)
 }
diff --git a/tests/cache-control/build.gradle.kts b/tests/cache-control/build.gradle.kts
index 618fa6a4..42f1dfa7 100644
--- a/tests/cache-control/build.gradle.kts
+++ b/tests/cache-control/build.gradle.kts
@@ -1,8 +1,6 @@
 plugins {
   alias(libs.plugins.kotlin.multiplatform)
-  // TODO: Use the external plugin for now - switch to the regular one when Schema is not relocated
-  // See https://github.com/apollographql/apollo-kotlin/pull/6176
-  alias(libs.plugins.apollo.external)
+  alias(libs.plugins.apollo)
 }
 
 kotlin {
diff --git a/tests/cache-variables-arguments/build.gradle.kts b/tests/cache-variables-arguments/build.gradle.kts
index ef320ee6..491614a0 100644
--- a/tests/cache-variables-arguments/build.gradle.kts
+++ b/tests/cache-variables-arguments/build.gradle.kts
@@ -1,8 +1,6 @@
 plugins {
   alias(libs.plugins.kotlin.multiplatform)
-  // TODO: Use the external plugin for now - switch to the regular one when Schema is not relocated
-  // See https://github.com/apollographql/apollo-kotlin/pull/6176
-  alias(libs.plugins.apollo.external)
+  alias(libs.plugins.apollo)
 }
 
 kotlin {
diff --git a/tests/defer/build.gradle.kts b/tests/defer/build.gradle.kts
index 5645d05f..cc0c7030 100644
--- a/tests/defer/build.gradle.kts
+++ b/tests/defer/build.gradle.kts
@@ -1,8 +1,6 @@
 plugins {
   alias(libs.plugins.kotlin.multiplatform)
-  // TODO: Use the external plugin for now - switch to the regular one when Schema is not relocated
-  // See https://github.com/apollographql/apollo-kotlin/pull/6176
-  alias(libs.plugins.apollo.external)
+  alias(libs.plugins.apollo)
 }
 
 kotlin {
diff --git a/tests/include-skip-operation-based/build.gradle.kts b/tests/include-skip-operation-based/build.gradle.kts
index 2cb4e8d2..4203cb6a 100644
--- a/tests/include-skip-operation-based/build.gradle.kts
+++ b/tests/include-skip-operation-based/build.gradle.kts
@@ -2,9 +2,7 @@ import com.apollographql.apollo.annotations.ApolloExperimental
 
 plugins {
   alias(libs.plugins.kotlin.multiplatform)
-  // TODO: Use the external plugin for now - switch to the regular one when Schema is not relocated
-  // See https://github.com/apollographql/apollo-kotlin/pull/6176
-  alias(libs.plugins.apollo.external)
+  alias(libs.plugins.apollo)
 }
 
 kotlin {