diff --git a/platform/credential-store-impl/src/ide/passwordSafe/impl/PasswordSafeImpl.kt b/platform/credential-store-impl/src/ide/passwordSafe/impl/PasswordSafeImpl.kt
index 3bf8e7a15ccb..60247a454acb 100644
--- a/platform/credential-store-impl/src/ide/passwordSafe/impl/PasswordSafeImpl.kt
+++ b/platform/credential-store-impl/src/ide/passwordSafe/impl/PasswordSafeImpl.kt
@@ -15,6 +15,7 @@ import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.openapi.util.NlsContexts
 import com.intellij.serviceContainer.NonInjectable
+import com.intellij.util.Ephemeral
 import com.intellij.util.SlowOperations
 import com.intellij.util.concurrency.SynchronizedClearableLazy
 import kotlinx.coroutines.Dispatchers
diff --git a/platform/credential-store/api-dump-experimental.txt b/platform/credential-store/api-dump-experimental.txt
index ec78671887d3..64f696a5c20e 100644
--- a/platform/credential-store/api-dump-experimental.txt
+++ b/platform/credential-store/api-dump-experimental.txt
@@ -1,7 +1,7 @@
 com.intellij.credentialStore.CredentialStore
 - *:ephemeral(java.lang.Object,kotlin.coroutines.Continuation):java.lang.Object
 - *:getAsync(com.intellij.credentialStore.CredentialAttributes,kotlin.coroutines.Continuation):java.lang.Object
-*:com.intellij.credentialStore.Ephemeral
+*:com.intellij.util.Ephemeral
 - a:asFlow():kotlinx.coroutines.flow.Flow
-- a:derive(kotlin.jvm.functions.Function1):com.intellij.credentialStore.Ephemeral
+- a:derive(kotlin.jvm.functions.Function1):com.intellij.util.Ephemeral
 - a:unwrap(kotlin.coroutines.Continuation):java.lang.Object
diff --git a/platform/credential-store/src/credentialStore/CredentialStore.kt b/platform/credential-store/src/credentialStore/CredentialStore.kt
index e612568ac092..275fcbe13e51 100644
--- a/platform/credential-store/src/credentialStore/CredentialStore.kt
+++ b/platform/credential-store/src/credentialStore/CredentialStore.kt
@@ -1,6 +1,8 @@
 // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.credentialStore
 
+import com.intellij.util.Ephemeral
+import com.intellij.util.StaticEphemeral
 import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.concurrency.await
 import org.jetbrains.concurrency.runAsync
diff --git a/platform/credential-store/src/credentialStore/Ephemeral.kt b/platform/credential-store/src/util/Ephemeral.kt
similarity index 97%
rename from platform/credential-store/src/credentialStore/Ephemeral.kt
rename to platform/credential-store/src/util/Ephemeral.kt
index 7b770970cd53..f68900a52e18 100644
--- a/platform/credential-store/src/credentialStore/Ephemeral.kt
+++ b/platform/credential-store/src/util/Ephemeral.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.credentialStore
+package com.intellij.util
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
@@ -46,4 +46,4 @@ internal class StaticEphemeral<T : Any>(private val data: T?) : Ephemeral<T> {
 
   override fun <P : Any> derive(map: (T) -> P?): Ephemeral<P> =
     StaticEphemeral(data?.let(map))
-}
+}
\ No newline at end of file