diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
index 1e4592e2e47..7586958262e 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
@@ -134,7 +134,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
 
         val dataManager = projectDescriptor.dataManager
 
-        if (IncrementalCompilation.ENABLED &&
+        if (IncrementalCompilation.isEnabled() &&
             chunk.targets.any { dataManager.dataPaths.getKotlinCacheVersion(it).isIncompatible() }
         ) {
             LOG.info("Clearing caches for " + chunk.targets.map { it.presentableName }.join())
@@ -215,7 +215,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
             copyJsLibraryFilesIfNeeded(chunk, project)
         }
 
-        if (!IncrementalCompilation.ENABLED) return OK
+        if (!IncrementalCompilation.isEnabled()) return OK
 
         val caches = filesToCompile.keySet().map { incrementalCaches[it]!! }
         val marker = ChangesProcessor(context, chunk, allCompiledFiles, caches)
@@ -293,8 +293,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
             return compileToJs(chunk, commonArguments, environment, null, messageCollector, project)
         }
 
-        if (IncrementalCompilation.ENABLED) {
-            for (target in chunk.getTargets()) {
+        if (IncrementalCompilation.isEnabled()) {
+            for (target in chunk.targets) {
                 val cache = incrementalCaches[target]!!
                 val removedAndDirtyFiles = filesToCompile[target] + dirtyFilesHolder.getRemovedFiles(target).map { File(it) }
                 cache.markOutputClassesDirty(removedAndDirtyFiles)
@@ -410,7 +410,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
             return sources
         }
 
-        if (!IncrementalCompilation.ENABLED) {
+        if (!IncrementalCompilation.isEnabled()) {
             return
         }
 
@@ -449,7 +449,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
     ): ChangesInfo {
         incrementalCaches.values().forEach { it.saveCacheFormatVersion() }
 
-        if (!IncrementalCompilation.ENABLED) {
+        if (!IncrementalCompilation.isEnabled()) {
             return ChangesInfo.NO_CHANGES
         }
 
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java
index f650f7042bf..4b55b5d3572 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java
@@ -72,7 +72,7 @@ public class KotlinBuilderModuleScriptGenerator {
             File outputDir = getOutputDirSafe(target);
 
             List<File> moduleSources = new ArrayList<File>(
-                    IncrementalCompilation.ENABLED
+                    IncrementalCompilation.isEnabled()
                     ? sourceFiles.get(target)
                     : KotlinSourceFileCollector.getAllKotlinSourceFiles(target));
 
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt
index 7e3fab51be1..42233675171 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt
@@ -38,7 +38,7 @@ class CacheFormatVersion(targetDataRoot: File) {
     private val file = File(targetDataRoot, FORMAT_VERSION_FILE_PATH)
 
     fun isIncompatible(): Boolean {
-        assert(IncrementalCompilation.ENABLED) { "Incremental compilation is not enabled" }
+        assert(IncrementalCompilation.isEnabled()) { "Incremental compilation is not enabled" }
         if (!file.exists()) return false
 
         val versionNumber = file.readText().toInt()
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java
index e9b2cda097e..1df8e11addd 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java
@@ -83,7 +83,7 @@ public class KotlinModuleXmlBuilder {
     ) {
         p.println("<!-- Classpath -->");
         for (File file : files) {
-            boolean isOutput = directoriesToFilterOut.contains(file) && !IncrementalCompilation.ENABLED;
+            boolean isOutput = directoriesToFilterOut.contains(file) && !IncrementalCompilation.isEnabled();
             if (isOutput) {
                 // For IDEA's make (incremental compilation) purposes, output directories of the current module and its dependencies
                 // appear on the class path, so we are at risk of seeing the results of the previous build, i.e. if some class was