diff --git a/cache/build.gradle.kts b/cache/build.gradle.kts
index 162d3ed..7e87099 100644
--- a/cache/build.gradle.kts
+++ b/cache/build.gradle.kts
@@ -45,14 +45,12 @@ kotlin {
 	sourceSets.commonMain.dependencies {
 		api(projects.state)
 		api(projects.stateCoroutines)
-		api(libs.kotlinx.datetime)
 
 		implementation(projects.logger)
 	}
 
 	sourceSets.commonTest.dependencies {
 		implementation(libsCommon.opensavvy.prepared.testBalloon)
-		implementation(libsCommon.opensavvy.prepared.kotlinx.datetime)
 		implementation(libsCommon.kotlin.test)
 	}
 }
diff --git a/cache/src/commonMain/kotlin/ExpirationCache.kt b/cache/src/commonMain/kotlin/ExpirationCache.kt
index 9156210..b6d4140 100644
--- a/cache/src/commonMain/kotlin/ExpirationCache.kt
+++ b/cache/src/commonMain/kotlin/ExpirationCache.kt
@@ -14,20 +14,23 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalTime::class)
+
 package opensavvy.cache
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlinx.datetime.Clock
-import kotlinx.datetime.Instant
 import opensavvy.logger.Logger.Companion.trace
 import opensavvy.logger.loggerFor
 import opensavvy.progress.done
 import opensavvy.state.coroutines.ProgressiveFlow
+import kotlin.time.Clock
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
+import kotlin.time.ExperimentalTime
+import kotlin.time.Instant
 
 /**
  * Cache layer that expires values from the previous layer after a specified [duration][expireAfter].
diff --git a/cache/src/commonMain/kotlin/contextual/ContextualExpirationCache.kt b/cache/src/commonMain/kotlin/contextual/ContextualExpirationCache.kt
index 5cd8c5a..1f3bd09 100644
--- a/cache/src/commonMain/kotlin/contextual/ContextualExpirationCache.kt
+++ b/cache/src/commonMain/kotlin/contextual/ContextualExpirationCache.kt
@@ -14,13 +14,16 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalTime::class)
+
 package opensavvy.cache.contextual
 
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.datetime.Clock
 import opensavvy.cache.expireAfter
 import opensavvy.state.coroutines.ProgressiveFlow
+import kotlin.time.Clock
 import kotlin.time.Duration
+import kotlin.time.ExperimentalTime
 
 internal class ContextualExpirationCache<I, C, F, V>(
 	private val upstream: ContextualCache<I, C, F, V>,
diff --git a/cache/src/commonTest/kotlin/ContextualCacheTest.kt b/cache/src/commonTest/kotlin/ContextualCacheTest.kt
index d37e2aa..4870f84 100644
--- a/cache/src/commonTest/kotlin/ContextualCacheTest.kt
+++ b/cache/src/commonTest/kotlin/ContextualCacheTest.kt
@@ -24,9 +24,9 @@ import opensavvy.cache.contextual.batchingCache
 import opensavvy.cache.contextual.cache
 import opensavvy.cache.contextual.cachedInMemory
 import opensavvy.cache.contextual.expireAfter
-import opensavvy.prepared.compat.kotlinx.datetime.clock
 import opensavvy.prepared.runner.testballoon.preparedSuite
 import opensavvy.prepared.suite.backgroundScope
+import opensavvy.prepared.suite.clock
 import opensavvy.prepared.suite.time
 import opensavvy.state.arrow.out
 import opensavvy.state.coroutines.now
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3e2d00e..819bb36 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,14 +3,12 @@
 [versions]
 arrow = "2.1.2"                       # https://github.com/arrow-kt/arrow/releases
 lincheck = "2.39"                     # https://github.com/JetBrains/lincheck/releases
-kotlinx-datetime = "0.6.2"            # https://github.com/Kotlin/kotlinx-datetime/releases
 kotlinx-coroutines = "1.10.2"         # https://github.com/Kotlin/kotlinx.coroutines/releases
 kotlin-js = "2025.7.6"                # https://central.sonatype.com/artifact/org.jetbrains.kotlin-wrappers/kotlin-js
 
 [plugins]
 
 [libraries]
-kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 
 kotlinJs = { module = "org.jetbrains.kotlin-wrappers:kotlin-js", version.ref = "kotlin-js" }