diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilder.kt
index 7d574a913bb..aaaa098392d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilder.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilder.kt
@@ -167,7 +167,7 @@ fun makeNodeModule(
     packageJson: PackageJson,
     files: (File) -> Unit
 ): PackageJson {
-    val dir = container.resolve(packageJson.name)
+    val dir = importedPackageDir(container, packageJson.name, packageJson.version)
 
     if (dir.exists()) dir.deleteRecursively()
 
@@ -186,4 +186,7 @@ fun makeNodeModule(
     }
 
     return packageJson
-}
\ No newline at end of file
+}
+
+fun importedPackageDir(container: File, name: String, version: String): File =
+    container.resolve(name).resolve(version)
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModulesCache.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModulesCache.kt
index a056de3a5fe..16e4010cdf1 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModulesCache.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModulesCache.kt
@@ -22,7 +22,7 @@ internal class GradleNodeModulesCache(val project: Project) : AutoCloseable {
     }
 
     internal val dir = project.nodeJs.root.nodeModulesGradleCacheDir
-    private val cache = ProcessedFilesCache(project, dir, STATE_FILE_NAME, "6")
+    private val cache = ProcessedFilesCache(project, dir, STATE_FILE_NAME, "8")
     private val visited = mutableSetOf<ResolvedDependency>()
 
     fun collectDependenciesFromConfiguration(configuration: Configuration, result: NpmGradleDependencies) {
@@ -66,7 +66,7 @@ internal class GradleNodeModulesCache(val project: Project) : AutoCloseable {
 
                 if (key != null) {
                     val (name, version) = key.split(":")
-                    result.externalModules.add(GradleNodeModule(name, version, dir.resolve(name)))
+                    result.externalModules.add(GradleNodeModule(name, version, importedPackageDir(dir, name, version)))
                 }
             }
         }