diff --git a/plugins/kotlin/refIndex/src/org/jetbrains/kotlin/idea/search/refIndex/KotlinCompilerReferenceIndexService.kt b/plugins/kotlin/refIndex/src/org/jetbrains/kotlin/idea/search/refIndex/KotlinCompilerReferenceIndexService.kt
index c534dc1bf061..84043d283048 100644
--- a/plugins/kotlin/refIndex/src/org/jetbrains/kotlin/idea/search/refIndex/KotlinCompilerReferenceIndexService.kt
+++ b/plugins/kotlin/refIndex/src/org/jetbrains/kotlin/idea/search/refIndex/KotlinCompilerReferenceIndexService.kt
@@ -27,7 +27,6 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.ProjectRootManager
 import com.intellij.openapi.startup.StartupActivity
 import com.intellij.openapi.util.ModificationTracker
-import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.*
 import com.intellij.psi.search.GlobalSearchScope
@@ -54,8 +53,6 @@ import org.jetbrains.kotlin.idea.search.not
 import org.jetbrains.kotlin.idea.search.restrictToKotlinSources
 import org.jetbrains.kotlin.idea.util.application.isUnitTestMode
 import org.jetbrains.kotlin.idea.util.application.runReadAction
-import org.jetbrains.kotlin.incremental.LookupSymbol
-import org.jetbrains.kotlin.incremental.storage.RelativeFileToPathConverter
 import org.jetbrains.kotlin.load.java.getPropertyNamesCandidatesByAccessorName
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -65,7 +62,6 @@ import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
 import org.jetbrains.kotlin.psi.psiUtil.parameterIndex
 import org.jetbrains.kotlin.synthetic.canBePropertyAccessor
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
-import java.io.File
 import java.nio.file.Path
 import java.util.*
 import java.util.concurrent.TimeUnit
@@ -73,7 +69,6 @@ import java.util.concurrent.atomic.LongAdder
 import java.util.concurrent.locks.ReentrantReadWriteLock
 import kotlin.concurrent.read
 import kotlin.concurrent.write
-import kotlin.io.path.Path
 import kotlin.io.path.exists
 import kotlin.io.path.isDirectory
 import kotlin.io.path.listDirectoryEntries
@@ -214,8 +209,7 @@ class KotlinCompilerReferenceIndexService(val project: Project) : Disposable, Mo
     private val hasIncrementalIndex: Boolean get() = buildDataPaths?.kotlinDataContainer != null
 
     private fun openStorage() {
-        val basePath = runReadAction { projectIfNotDisposed?.basePath } ?: return
-        val pathConverter = RelativeFileToPathConverter(File(basePath))
+        val projectPath = runReadAction { projectIfNotDisposed?.basePath } ?: return
         val buildDataPaths = buildDataPaths
         val kotlinDataPath = buildDataPaths?.kotlinDataContainer ?: run {
             LOG.warn("try to open storage without index directory")
@@ -223,7 +217,7 @@ class KotlinCompilerReferenceIndexService(val project: Project) : Disposable, Mo
         }
 
         val initializationTime = measureNanoTime {
-            storage = KotlinCompilerReferenceIndexStorage(kotlinDataPath, pathConverter).apply {
+            storage = KotlinCompilerReferenceIndexStorage(kotlinDataPath, projectPath).apply {
                 initialize(buildDataPaths)
             }
         }
@@ -285,11 +279,7 @@ class KotlinCompilerReferenceIndexService(val project: Project) : Disposable, Mo
             subclassesFqNames.flatMap { subclass -> originalFqNames.map { subclass.child(it.shortName()) } }
         }.orEmpty()
 
-        return originalFqNames.toSet().plus(additionalFqNames).flatMapTo(mutableSetOf()) { currentFqName ->
-            val name = currentFqName.shortName().asString()
-            val scope = currentFqName.parent().takeUnless(FqName::isRoot)?.asString() ?: ""
-            storage.get(LookupSymbol(name, scope)).mapNotNull { VfsUtil.findFile(Path(it), true) }
-        }
+        return originalFqNames.toSet().plus(additionalFqNames).flatMapTo(mutableSetOf(), storage::getUsages)
     })
 
     private fun findSubclassesFqNamesIfApplicable(element: PsiElement, isFromLibrary: Boolean): Sequence<FqName>? {
diff --git a/plugins/kotlin/refIndex/src/org/jetbrains/kotlin/idea/search/refIndex/KotlinCompilerReferenceIndexStorage.kt b/plugins/kotlin/refIndex/src/org/jetbrains/kotlin/idea/search/refIndex/KotlinCompilerReferenceIndexStorage.kt
index 5ab2223e2be6..d101af87c9ad 100644
--- a/plugins/kotlin/refIndex/src/org/jetbrains/kotlin/idea/search/refIndex/KotlinCompilerReferenceIndexStorage.kt
+++ b/plugins/kotlin/refIndex/src/org/jetbrains/kotlin/idea/search/refIndex/KotlinCompilerReferenceIndexStorage.kt
@@ -2,6 +2,8 @@
 package org.jetbrains.kotlin.idea.search.refIndex
 
 import com.intellij.openapi.diagnostic.logger
+import com.intellij.openapi.vfs.VfsUtil
+import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.util.containers.generateRecursiveSequence
 import com.intellij.util.io.EnumeratorStringDescriptor
 import com.intellij.util.io.PersistentHashMap
@@ -11,19 +13,19 @@ import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType
 import org.jetbrains.jps.builders.storage.BuildDataPaths
 import org.jetbrains.kotlin.incremental.KOTLIN_CACHE_DIRECTORY_NAME
 import org.jetbrains.kotlin.incremental.LookupStorage
+import org.jetbrains.kotlin.incremental.LookupSymbol
+import org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.Companion.CACHE_EXTENSION
 import org.jetbrains.kotlin.incremental.storage.CollectionExternalizer
-import org.jetbrains.kotlin.incremental.storage.FileToPathConverter
+import org.jetbrains.kotlin.incremental.storage.RelativeFileToPathConverter
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty
+import java.io.File
 import java.nio.file.Path
 import kotlin.io.path.*
 
 class KotlinCompilerReferenceIndexStorage(
-    private val targetDataDir: Path,
-    pathConverter: FileToPathConverter,
-) : LookupStorage(
-    targetDataDir.toFile(),
-    pathConverter,
+    targetDataDir: Path,
+    projectPath: String,
 ) {
     companion object {
         /**
@@ -36,15 +38,20 @@ class KotlinCompilerReferenceIndexStorage(
      * [org.jetbrains.kotlin.incremental.storage.BasicMapsOwner.storageFile]
      */
     private val String.asStorageName: String get() = "$this.$CACHE_EXTENSION"
-    private val String.storagePath: Path get() = targetDataDir.resolve(asStorageName)
 
-    private val subtypesStorage = ClassOneToManyStorage(SUBTYPES.storagePath)
+    private val lookupStorage = LookupStorage(targetDataDir.toFile(), RelativeFileToPathConverter(File(projectPath)))
+    private val subtypesStorage = ClassOneToManyStorage(targetDataDir.resolve(SUBTYPES.asStorageName))
 
-    override fun close() {
+    fun close() {
+        lookupStorage.close()
         subtypesStorage.closeAndClean()
-        super.close()
     }
 
+    fun getUsages(fqName: FqName): List<VirtualFile> = LookupSymbol(
+        name = fqName.shortName().asString(),
+        scope = fqName.parent().takeUnless(FqName::isRoot)?.asString() ?: "",
+    ).let(lookupStorage::get).mapNotNull { VfsUtil.findFile(Path(it), true) }
+
     fun getSubtypesOf(fqName: FqName, deep: Boolean): Sequence<FqName> = subtypesStorage[fqName, deep]
 
     fun initialize(buildDataPaths: BuildDataPaths) {