diff --git a/libraries/stdlib/js-v1/build.gradle b/libraries/stdlib/js-v1/build.gradle
index de56e6b8fd5..8a27ebeb755 100644
--- a/libraries/stdlib/js-v1/build.gradle
+++ b/libraries/stdlib/js-v1/build.gradle
@@ -177,8 +177,8 @@ task compileJs(type: NoDebugJavaExec) {
     def compileKotlin2JsFiles = compileKotlin2Js.destinationDirectory
     doFirst {
         args = [jsOutputFileName, rootDir, "$jsSrcDir/wrapper.js"] + inputFiles.collect { it.path }.sort() +
-                (compileBuiltinsKotlin2JsFiles.asFile.get().listFiles().sort() +
-                        compileKotlin2JsFiles.asFile.get().listFiles().sort()).findAll {
+                (compileBuiltinsKotlin2JsFiles.asFileTree.files.sort() +
+                        compileKotlin2JsFiles.asFileTree.files.sort()).findAll {
                     it.name.endsWith(".js") && !it.name.endsWith(".meta.js")
                 }
     }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt
index 897c17a2d17..7479fcc569a 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt
@@ -75,6 +75,11 @@ abstract class KotlinJsIrLink @Inject constructor(
     @get:Input
     val outputGranularity: KotlinJsIrOutputGranularity = propertiesProvider.jsIrOutputGranularity
 
+    // Incremental stuff of link task is inside compiler
+    @get:Internal
+    override val taskBuildCacheableOutputDirectory: DirectoryProperty
+        get() = super.taskBuildCacheableOutputDirectory
+
     @get:Internal
     @get:Deprecated("Please use modeProperty instead.")
     var mode: KotlinJsBinaryMode
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index 0338ec87029..39dd55b863b 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -259,7 +259,7 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments> @Inject constr
 
     // avoid creating directory in getter: this can lead to failure in parallel build
     @get:OutputDirectory
-    internal val taskBuildCacheableOutputDirectory: DirectoryProperty = objectFactory.directoryProperty()
+    internal open val taskBuildCacheableOutputDirectory: DirectoryProperty = objectFactory.directoryProperty()
 
     // avoid creating directory in getter: this can lead to failure in parallel build
     @get:LocalState