diff --git a/buildSrc/src/main/kotlin/instrument.kt b/buildSrc/src/main/kotlin/instrument.kt
index 60a11e61472..e1a23d810b0 100644
--- a/buildSrc/src/main/kotlin/instrument.kt
+++ b/buildSrc/src/main/kotlin/instrument.kt
@@ -111,17 +111,21 @@ open class IntelliJInstrumentCodeTask : ConventionTask() {
         private const val LOADER_REF = "java2.loader"
     }
 
-    var sourceSet: SourceSet? = null
-
+    @Classpath
     var instrumentationClasspath: Configuration? = null
 
-    @Input
+    @InputFiles
+    @PathSensitive(PathSensitivity.RELATIVE)
     var originalClassesDirs: FileCollection? = null
 
     @get:Input
     var instrumentNotNull: Boolean = false
 
+    @Internal
+    var sourceSet: SourceSet? = null
+
     @get:InputFiles
+    @get:PathSensitive(PathSensitivity.RELATIVE)
     val sourceDirs: FileCollection
         get() = project.files(sourceSet!!.allSource.srcDirs.filter { !sourceSet!!.resources.contains(it) && it.exists() })