diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java
index 75333f99e40e..fcb2a3f0efbd 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java
@@ -174,8 +174,8 @@ public class VirtualFilePointerContainerImpl implements VirtualFilePointerContai
   private static final Trinity<String[], VirtualFile[], VirtualFile[]> EMPTY = Trinity.create(ArrayUtil.EMPTY_STRING_ARRAY, VirtualFile.EMPTY_ARRAY, VirtualFile.EMPTY_ARRAY);
   @NotNull
   private Trinity<String[], VirtualFile[], VirtualFile[]> cacheThings() {
+    myTimeStampOfCachedThings = myVirtualFilePointerManager.getModificationCount();
     if (myList.isEmpty()) {
-      myTimeStampOfCachedThings = myVirtualFilePointerManager.getModificationCount();
       myCachedDirectories = VirtualFile.EMPTY_ARRAY;
       myCachedFiles = VirtualFile.EMPTY_ARRAY;
       myCachedUrls = ArrayUtil.EMPTY_STRING_ARRAY;
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java
index bc7365817789..1ab5071acdf3 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java
@@ -99,9 +99,8 @@ public class VirtualFilePointerImpl extends UserDataHolderBase implements Virtua
 
   @NotNull
   private static String getUrlFromPair(Pair<VirtualFile, String> fileAndUrl) {
-    VirtualFile file = fileAndUrl.first;
     String url = fileAndUrl.second;
-    return url != null ? url : file.getUrl();
+    return url != null ? url : fileAndUrl.first.getUrl();
   }
 
   @Override