diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java
index 4ef196b92838..e39512e334f1 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java
@@ -217,6 +217,7 @@ public class CompileContext extends UserDataHolderBase implements MessageHandler
 
   void onChunkBuildComplete(@NotNull ModuleChunk chunk) throws IOException {
     myDataManager.closeSourceToOutputStorages(chunk, isCompilingTests());
+    myDataManager.flush(true);
     myFsState.clearContextRoundData();
     myFsState.clearContextChunk();
 
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
index 7ad2d3d5a626..e076cabbd366 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
@@ -509,16 +509,6 @@ public class JavaBuilder extends ModuleLevelBuilder {
     urls[index++] = getResourcePath(GridConstraints.class).toURI().toURL(); // forms_rt.jar
     //urls.add(getResourcePath(CellConstraints.class).toURI().toURL());  // jgoodies-forms
     
-    final Map<String, byte[]> compiled = new HashMap<String, byte[]>();
-    for (OutputFileObject fileObject : outputSink.getFileObjects()) {
-      final String name = fileObject.getClassName();
-      if (name != null) {
-        final OutputFileObject.Content content = fileObject.getContent();
-        if (content != null) {
-          compiled.put(name, content.toByteArray());
-        }
-      }
-    }
     return new InstrumentationClassFinder(platformUrls, urls, outputSink);
   }
 
diff --git a/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java b/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
index 799ea466e429..1d3ca5718686 100644
--- a/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
+++ b/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
@@ -1836,10 +1836,8 @@ public class Mappings {
       // flush if you own the context
       final DependencyContext context = myContext;
       if (context != null) {
-        if (memoryCachesOnly) {
-          context.clearMemoryCaches();
-        }
-        else {
+        context.clearMemoryCaches();
+        if (!memoryCachesOnly) {
           context.flush();
         }
       }