diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsUpdater.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsUpdater.kt
index 416f089a4e0..333fbe1ebf1 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsUpdater.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsUpdater.kt
@@ -255,9 +255,6 @@ abstract class ScriptClassRootsUpdater(
             openedScripts.forEach {
                 PsiManager.getInstance(project).findFile(it)?.let { psiFile ->
                     if (psiFile is KtFile) {
-                        // start loading for files that previously was cached by custom scripting support
-                        ScriptConfigurationManager.getInstance(project).getConfiguration(psiFile)
-
                         DaemonCodeAnalyzer.getInstance(project).restart(psiFile)
                     }
                 }
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt
index cd4012991f8..5eae01bb447 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt
@@ -294,9 +294,18 @@ class GradleBuildRootsManager(val project: Project) : GradleBuildRootsLocator(),
         }
     }
 
-    private fun loadLinkedRoot(settings: GradleProjectSettings) =
-        if (!enabled) Legacy(settings)
-        else tryLoadFromFsCache(settings) ?: createOtherLinkedRoot(settings)
+    private fun loadLinkedRoot(settings: GradleProjectSettings): GradleBuildRoot {
+        if (!enabled) {
+            return Legacy(settings)
+        }
+
+        val supported = kotlinDslScriptsModelImportSupported(settings.resolveGradleVersion().version)
+
+        return when {
+            supported -> tryLoadFromFsCache(settings) ?: New(settings)
+            else -> Legacy(settings)
+        }
+    }
 
     private fun tryLoadFromFsCache(settings: GradleProjectSettings) =
         tryCreateImportedRoot(settings.externalProjectPath) {
@@ -310,14 +319,6 @@ class GradleBuildRootsManager(val project: Project) : GradleBuildRootsLocator(),
         settings: GradleProjectSettings
     ) = data.copy(projectRoots = data.projectRoots.toSet() + settings.modules)
 
-    private fun createOtherLinkedRoot(settings: GradleProjectSettings): GradleBuildRoot {
-        val supported = kotlinDslScriptsModelImportSupported(settings.resolveGradleVersion().version)
-        return when {
-            supported -> New(settings)
-            else -> Legacy(settings)
-        }
-    }
-
     private fun tryCreateImportedRoot(
         externalProjectPath: String,
         lastModifiedFiles: LastModifiedFiles = loadLastModifiedFiles(externalProjectPath) ?: LastModifiedFiles(),