diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CachedLibraries.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CachedLibraries.kt
index 4a2fa83ccb4..9332b4545c0 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CachedLibraries.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CachedLibraries.kt
@@ -175,16 +175,16 @@ class CachedLibraries(
                     ?: error("No cache found for library ${library.libraryName} at $explicitPath")
         } else {
             val libraryPath = library.libraryFile.absolutePath
-            if (autoCacheableFrom.any { libraryPath.startsWith(it.absolutePath) }) {
-                val dir = computeVersionedCacheDirectory(autoCacheDirectory, library, uniqueNameToLibrary)
+            implicitCacheDirectories.firstNotNullOfOrNull { dir ->
                 selectCache(library, dir.child(getPerFileCachedLibraryName(library)))
                         ?: selectCache(library, dir.child(getCachedLibraryName(library)))
-            } else {
-                implicitCacheDirectories.firstNotNullOfOrNull { dir ->
-                    selectCache(library, dir.child(getPerFileCachedLibraryName(library)))
-                            ?: selectCache(library, dir.child(getCachedLibraryName(library)))
-                }
             }
+                    ?: autoCacheDirectory.takeIf { autoCacheableFrom.any { libraryPath.startsWith(it.absolutePath) } }
+                            ?.let {
+                                val dir = computeVersionedCacheDirectory(it, library, uniqueNameToLibrary)
+                                selectCache(library, dir.child(getPerFileCachedLibraryName(library)))
+                                        ?: selectCache(library, dir.child(getCachedLibraryName(library)))
+                            }
         }
 
         cache?.let { library to it }