diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java
index 8aba0dd03ecf..6dda1df689b2 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java
@@ -239,10 +239,10 @@ public class RootIndex {
       Graph graph = new Graph();
 
       MultiMap<VirtualFile, Node> roots = MultiMap.createSmart();
-      Map<Module, List<OrderEnumerationHandler>> handlersMap = ContainerUtil.newHashMap();
 
       for (final Module module : ModuleManager.getInstance(myProject).getModules()) {
         final ModuleRootManager moduleRootManager = ModuleRootManager.getInstance(module);
+        List<OrderEnumerationHandler> handlers = OrderEnumeratorBase.getCustomHandlers(module);
         for (OrderEntry orderEntry : moduleRootManager.getOrderEntries()) {
           if (orderEntry instanceof ModuleOrderEntry) {
             ModuleOrderEntry moduleOrderEntry = (ModuleOrderEntry)orderEntry;
@@ -265,11 +265,6 @@ public class RootIndex {
                   roots.putValue(sourceRoot, node);
                 }
               }
-              List<OrderEnumerationHandler> handlers = handlersMap.get(depModule);
-              if (handlers == null) {
-                handlers = OrderEnumeratorBase.getCustomHandlers(depModule);
-                handlersMap.put(depModule, handlers);
-              }
               boolean shouldRecurse = en.shouldRecurse(moduleOrderEntry, handlers);
               node.myEdges.add(new Edge(module, moduleOrderEntry, shouldRecurse));
             }