diff --git a/platform/util/src/com/intellij/util/lang/ClassPath.java b/platform/util/src/com/intellij/util/lang/ClassPath.java
index 5055c0ad4a49..ec363dae33d7 100644
--- a/platform/util/src/com/intellij/util/lang/ClassPath.java
+++ b/platform/util/src/com/intellij/util/lang/ClassPath.java
@@ -119,7 +119,7 @@ class ClassPath {
         List<Loader> loaders = myCache.getLoaders(s);
         for (int j = 0, size = loaders.size(); j < size; ++j ) {
           final Loader loader = loaders.get(j);
-          //if (!myCache.loaderHasName(s, loader)) continue;
+          if (!myCache.loaderHasName(s, loader)) continue;
           final Resource resource = loader.getResource(s, flag);
           if (resource != null) {
             if (ourDumpOrder) {
diff --git a/platform/util/src/com/intellij/util/lang/FileLoader.java b/platform/util/src/com/intellij/util/lang/FileLoader.java
index 13504fcdade4..35b07118a5ce 100644
--- a/platform/util/src/com/intellij/util/lang/FileLoader.java
+++ b/platform/util/src/com/intellij/util/lang/FileLoader.java
@@ -111,6 +111,7 @@ class FileLoader extends Loader {
           String line = reader.readLine();
           if (line == null) break;
           cache.addResourceEntry(line, this);
+          cache.addNameEntry(line, this);
         }
         while (true);
       }