diff --git a/platform/core-impl/src/com/intellij/psi/impl/PsiCachedValue.java b/platform/core-impl/src/com/intellij/psi/impl/PsiCachedValue.java
index 63b1f02e988d..808a1cfcb7fc 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/PsiCachedValue.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/PsiCachedValue.java
@@ -52,9 +52,13 @@ public abstract class PsiCachedValue<T> extends CachedValueBase<T> {
 
   @Override
   protected boolean isDependencyOutOfDate(Object dependency, long oldTimeStamp) {
-    return !(dependency instanceof PsiElement && myLastPsiTimeStamp == myManager.getModificationTracker().getModificationCount()) &&
-           super.isDependencyOutOfDate(dependency, oldTimeStamp);
+    if (dependency instanceof PsiElement &&
+        myLastPsiTimeStamp == myManager.getModificationTracker().getModificationCount() &&
+        ((PsiElement)dependency).isPhysical()) {
+      return false;
+    }
 
+    return super.isDependencyOutOfDate(dependency, oldTimeStamp);
   }
 
   @Override
diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java
index e9493f197f39..fbe5ae568fa5 100644
--- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java
+++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java
@@ -615,7 +615,7 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag {
 
         final int s = result.size();
         XmlTag[] tags = s > 0 ? ContainerUtil.toArray(result, new XmlTag[s]) : EMPTY;
-        return Result.create(tags, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
+        return Result.create(tags, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT, getContainingFile());
 
       }
     });