diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/FinishBuildListner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/FinishBuildListener.kt
similarity index 89%
rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/FinishBuildListner.kt
rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/FinishBuildListener.kt
index c3b5d8dda80..c18e85ec376 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/FinishBuildListner.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/FinishBuildListener.kt
@@ -20,23 +20,10 @@ import org.gradle.BuildAdapter
 import org.gradle.api.logging.Logging
 import org.gradle.BuildResult
 import java.lang.ref.Reference
-import java.lang.reflect.Array
-import kotlin.platform.platformStatic
 
 class FinishBuildListener(var pluginClassLoader: ParentLastURLClassLoader?) : BuildAdapter() {
     val log = Logging.getLogger(this.javaClass)
 
-    class object {
-        platformStatic
-        fun isRequestedClass(fqName: String): Boolean {
-            return when (fqName) {
-                "com.intellij.openapi.util.io.ZipFileCache",
-                "com.intellij.openapi.util.LowMemoryWatcher" -> true
-                else -> false
-            }
-        }
-    }
-
     override fun buildFinished(result: BuildResult?) {
         log.debug("Build finished listener")
 
@@ -66,7 +53,7 @@ class FinishBuildListener(var pluginClassLoader: ParentLastURLClassLoader?) : Bu
             val referentField = javaClass<Reference<Any>>().getDeclaredField("referent")
             referentField.setAccessible(true)
 
-            val table = tableField[threadLocalsField[thread]] as kotlin.Array<*>
+            val table = tableField[threadLocalsField[thread]] as Array<*>
 
             for (entry in table) {
                 if (entry != null) {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/ParentLastURLClassLoader.java b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/ParentLastURLClassLoader.java
index 8f5b9525a3f..da2595cb426 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/ParentLastURLClassLoader.java
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/ParentLastURLClassLoader.java
@@ -1,13 +1,10 @@
 package org.jetbrains.kotlin.gradle.plugin;
 
-
 import org.jetbrains.annotations.NotNull;
 
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * A parent-last classloader that will try the child classloader first and then the parent.
@@ -57,8 +54,6 @@ public class ParentLastURLClassLoader extends ClassLoader {
      * We need this because findClass is protected in URLClassLoader
      */
     public static class ChildURLClassLoader extends URLClassLoader {
-        private final Map<String, Class<?>> cache = new HashMap<String, Class<?>>();
-
         private FindClassClassLoader realParent;
 
         public ChildURLClassLoader(URL[] urls, FindClassClassLoader realParent) {
@@ -71,18 +66,12 @@ public class ParentLastURLClassLoader extends ClassLoader {
         @NotNull
         @Override
         public Class<?> findClass(@NotNull String name) throws ClassNotFoundException {
+            Class<?> loaded = findLoadedClass(name);
+            if (loaded != null) {
+                return loaded;
+            }
+
             try {
-                // Replace with FinishBuildListener.isRequestedClass(name) after rewriting this class on Kotlin
-                if (name.equals("com.intellij.openapi.util.io.ZipFileCache") ||
-                        name.equals("com.intellij.openapi.util.LowMemoryWatcher")) {
-                    if (cache.containsKey(name)) return cache.get(name);
-
-                    Class<?> aClass = super.findClass(name);
-                    cache.put(name, aClass);
-
-                    return aClass;
-                }
-
                 return super.findClass(name);
             } catch (ClassNotFoundException e) {
                 // if that fails, we ask our real parent classloader to load the class (we give up)