diff --git a/build-logic/src/main/kotlin/Mpp.kt b/build-logic/src/main/kotlin/Mpp.kt
index 9c5c1e1cb48..ee55faaa77b 100644
--- a/build-logic/src/main/kotlin/Mpp.kt
+++ b/build-logic/src/main/kotlin/Mpp.kt
@@ -110,13 +110,6 @@ fun Project.configureMpp(
 
     configureSourceSetGraph()
     addTestDependencies()
-
-    tasks.withType(KotlinJsIrLink::class.java).configureEach {
-      notCompatibleWithConfigurationCache("https://youtrack.jetbrains.com/issue/KT-60311/")
-    }
-    tasks.withType(KotlinNativeLink::class.java).configureEach {
-      notCompatibleWithConfigurationCache("https://youtrack.jetbrains.com/issue/KT-60311/")
-    }
   }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 1a8fc5db4ab..8b5f187fabd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,7 +24,7 @@ kotlin.stdlib.default.dependency=false
 # Enable the build cache
 org.gradle.caching=true
 # Enable the configuration cache
-# org.gradle.configuration-cache=true
+org.gradle.configuration-cache=true
 
 org.gradle.parallel=true
 
diff --git a/tests/gradle.properties b/tests/gradle.properties
index 0b44bc4dc83..17af84f6e46 100644
--- a/tests/gradle.properties
+++ b/tests/gradle.properties
@@ -10,7 +10,7 @@ kotlin.stdlib.default.dependency=false
 # Enable the build cache
 org.gradle.caching=true
 # Enable the configuration cache
-# org.gradle.configuration-cache=true
+org.gradle.configuration-cache=true
 
 org.gradle.parallel=true
 
diff --git a/tests/gzip/build.gradle.kts b/tests/gzip/build.gradle.kts
index 65f3d1e298f..fd47314a5e1 100644
--- a/tests/gzip/build.gradle.kts
+++ b/tests/gzip/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest
-
 plugins {
   id("org.jetbrains.kotlin.multiplatform")
   id("com.apollographql.apollo3")
@@ -28,7 +26,3 @@ apollo {
     packageName.set("gzip")
   }
 }
-
-tasks.named("compileKotlinJvm").configure {
-  notCompatibleWithConfigurationCache("https://youtrack.jetbrains.com/issue/KT-60311/")
-}
\ No newline at end of file