diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt
index cd842e3e081..c711981e09f 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt
@@ -39,7 +39,7 @@ fun Project.initKapt(
         kotlinOptions: Any?,
         subpluginEnvironment: SubpluginEnvironment,
         tasksProvider: KotlinTasksProvider
-): AbstractCompile? {
+): KotlinCompile? {
     val kaptExtension = extensions.getByType(KaptExtension::class.java)
     val kotlinAfterJavaTask: KotlinCompile?
 
@@ -53,7 +53,6 @@ fun Project.initKapt(
         kotlinAfterJavaTask.destinationDir = kotlinTask.destinationDir
         kotlinTask.destinationDir = stubsDir
         kotlinTask.kaptOptions.generateStubs = true
-        javaTask.appendClasspathDynamically(stubsDir)
 
         val javaDestinationDir = project.files(javaTask.destinationDir)
         javaTask.doLast {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
index 803d4e84a6c..1c883204b26 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
@@ -161,7 +161,7 @@ class Kotlin2JvmSourceSetProcessor(
                 val javaTask = project.tasks.findByName(sourceSet.compileJavaTaskName)
                 if (javaTask !is JavaCompile) return@afterEvaluate
 
-                var kotlinAfterJavaTask: AbstractCompile? = null
+                var kotlinAfterJavaTask: KotlinCompile? = null
 
                 if (aptConfiguration.dependencies.size > 1) {
                     javaTask.dependsOn(aptConfiguration.buildDependencies)
@@ -434,7 +434,7 @@ open class KotlinAndroidPlugin @Inject constructor(val scriptHandler: ScriptHand
 
             val (aptOutputDir, aptWorkingDir) = project.getAptDirsForSourceSet(variantDataName)
             variantData.addJavaSourceFoldersToModel(aptOutputDir)
-            var kotlinAfterJavaTask: AbstractCompile? = null
+            var kotlinAfterJavaTask: KotlinCompile? = null
 
             if (javaTask is JavaCompile && aptFiles.isNotEmpty()) {
                 val kaptManager = AnnotationProcessingManager(kotlinTask, javaTask, variantDataName,
@@ -460,20 +460,18 @@ open class KotlinAndroidPlugin @Inject constructor(val scriptHandler: ScriptHand
     }
 }
 
-private fun configureJavaTask(kotlinTask: AbstractCompile, javaTask: AbstractCompile, kotlinAfterJavaTask: AbstractCompile?, logger: Logger) {
+private fun configureJavaTask(kotlinTask: KotlinCompile, javaTask: AbstractCompile, kotlinAfterJavaTask: KotlinCompile?, logger: Logger) {
     // Since we cannot update classpath statically, java not able to detect changes in the classpath after kotlin compiler.
     // Therefore this (probably inefficient since java cannot decide "uptodateness" by the list of changed class files, but told
     // explicitly being out of date whenever any kotlin files are compiled
-    if (kotlinTask.anyClassesCompiled != null) {
-        kotlinTask.anyClassesCompiled = false
+    kotlinTask.anyClassesCompiled = false
 
-        javaTask.outputs.upToDateWhen { task ->
-            val kotlinClassesCompiled = kotlinTask.anyClassesCompiled ?: false
-            if (kotlinClassesCompiled) {
-                logger.info("Marking $task out of date, because kotlin classes are changed")
-            }
-            !kotlinClassesCompiled
+    javaTask.outputs.upToDateWhen { task ->
+        val kotlinClassesCompiled = kotlinTask.anyClassesCompiled
+        if (kotlinClassesCompiled) {
+            logger.info("Marking $task out of date, because kotlin classes are changed")
         }
+        !kotlinClassesCompiled
     }
 
     javaTask.dependsOn(kotlinTask.name)
@@ -485,16 +483,14 @@ private fun configureJavaTask(kotlinTask: AbstractCompile, javaTask: AbstractCom
      * ex. it adds some support libraries jars after execution of prepareComAndroidSupportSupportV42311Library task,
      * so it's only safe to modify javaTask.classpath right before its usage
      */
-    if (kotlinAfterJavaTask == null) {
-        javaTask.appendClasspathDynamically(kotlinTask.destinationDir!!)
-    }
+    javaTask.appendClasspathDynamically(kotlinTask.destinationDir!!)
 }
 
 private fun createSyncOutputTask(
         project: Project,
-        kotlinTask: AbstractCompile,
+        kotlinTask: KotlinCompile,
         javaTask: AbstractCompile,
-        kotlinAfterJavaTask: AbstractCompile?,
+        kotlinAfterJavaTask: KotlinCompile?,
         variantName: String
 ) {
     // if kotlinAfterJavaTask is not null then kotlinTask compiles stubs, so don't sync them
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/taskUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/taskUtils.kt
index afbb06d54d9..715da7ff4e0 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/taskUtils.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/taskUtils.kt
@@ -56,28 +56,4 @@ internal fun AbstractCompile.appendClasspathDynamically(file: File) {
 internal fun Task.finalizedByIfNotFailed(finalizer: Task) {
     finalizer.onlyIf { this@finalizedByIfNotFailed.state.failure == null }
     this.finalizedBy(finalizer)
-}
-
-internal var AbstractTask.anyClassesCompiled: Boolean? by TaskPropertyDelegate("anyClassesCompiled")
-internal var AbstractTask.friendTaskName: String? by TaskPropertyDelegate("friendTaskName")
-internal var AbstractTask.javaOutputDir: File? by TaskPropertyDelegate("javaOutputDir")
-
-inline
-internal fun <reified T : Any> TaskPropertyDelegate(propertyName: String) =
-        TaskPropertyDelegate(propertyName, T::class.java)
-
-internal class TaskPropertyDelegate<T : Any>(private val propertyName: String, private val klass: Class<T>) {
-    operator fun getValue(task: Any?, property: KProperty<*>): T? {
-        if (task !is AbstractCompile) throw IllegalStateException("TaskPropertyDelegate could extend only AbstractCompile")
-
-        if ( !task.hasProperty(propertyName)) return null
-
-        return task.property(propertyName)?.let { klass.cast(it) }
-    }
-
-    operator fun setValue(task: Any?, property: KProperty<*>, value: T?) {
-        if (task !is AbstractCompile) throw IllegalStateException("TaskPropertyDelegate could extend only AbstractCompile")
-
-        task.setProperty(propertyName, value)
-    }
 }
\ No newline at end of file