diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaLineBreakpointTypeBase.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaLineBreakpointTypeBase.java
index a344abf98881..1943a0999ec7 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaLineBreakpointTypeBase.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaLineBreakpointTypeBase.java
@@ -84,7 +84,7 @@ public abstract class JavaLineBreakpointTypeBase<P extends JavaBreakpointPropert
   public final boolean canPutAt(@NotNull final VirtualFile file, final int line, @NotNull Project project) {
     final PsiFile psiFile = PsiManager.getInstance(project).findFile(file);
     // JSPX supports jvm debugging, but not in XHTML files
-    if (psiFile == null || psiFile.getVirtualFile().getFileType() == StdFileTypes.XHTML) {
+    if (psiFile == null || psiFile.getViewProvider().getFileType() == StdFileTypes.XHTML) {
       return false;
     }
 
diff --git a/json/src/com/intellij/json/psi/impl/JsonFileImpl.java b/json/src/com/intellij/json/psi/impl/JsonFileImpl.java
index aef96b0a3a7b..b8d5950c53d1 100644
--- a/json/src/com/intellij/json/psi/impl/JsonFileImpl.java
+++ b/json/src/com/intellij/json/psi/impl/JsonFileImpl.java
@@ -20,7 +20,7 @@ public class JsonFileImpl extends PsiFileBase implements JsonFile {
   @NotNull
   @Override
   public FileType getFileType() {
-    return getViewProvider().getVirtualFile().getFileType();
+    return getViewProvider().getFileType();
   }
 
   @Nullable
diff --git a/platform/core-impl/src/com/intellij/psi/impl/file/PsiBinaryFileImpl.java b/platform/core-impl/src/com/intellij/psi/impl/file/PsiBinaryFileImpl.java
index 63c635330433..8144b7c0428f 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/file/PsiBinaryFileImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/file/PsiBinaryFileImpl.java
@@ -42,7 +42,6 @@ public class PsiBinaryFileImpl extends PsiElementBase implements PsiBinaryFile,
   private String myName; // for myFile == null only
   private byte[] myContents; // for myFile == null only
   private final long myModificationStamp;
-  private final FileType myFileType;
   private final FileViewProvider myViewProvider;
 
   public PsiBinaryFileImpl(PsiManagerImpl manager, FileViewProvider viewProvider) {
@@ -50,7 +49,6 @@ public class PsiBinaryFileImpl extends PsiElementBase implements PsiBinaryFile,
     myManager = manager;
     final VirtualFile virtualFile = myViewProvider.getVirtualFile();
     myModificationStamp = virtualFile.getModificationStamp();
-    myFileType = viewProvider.getVirtualFile().getFileType();
   }
 
   @Override
@@ -277,7 +275,7 @@ public class PsiBinaryFileImpl extends PsiElementBase implements PsiBinaryFile,
   @Override
   @NotNull
   public FileType getFileType() {
-    return myFileType;
+    return myViewProvider.getFileType();
   }
 
   @Override
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/PsiPlainTextFileImpl.java b/platform/core-impl/src/com/intellij/psi/impl/source/PsiPlainTextFileImpl.java
index caf0130e9e8e..9126df95bd83 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/PsiPlainTextFileImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/PsiPlainTextFileImpl.java
@@ -28,7 +28,7 @@ public class PsiPlainTextFileImpl extends PsiFileImpl implements PsiPlainTextFil
 
   public PsiPlainTextFileImpl(FileViewProvider viewProvider) {
     super(PlainTextTokenTypes.PLAIN_TEXT_FILE, PlainTextTokenTypes.PLAIN_TEXT_FILE, viewProvider);
-    myFileType = viewProvider.getBaseLanguage() != PlainTextLanguage.INSTANCE ? PlainTextFileType.INSTANCE : viewProvider.getVirtualFile().getFileType();
+    myFileType = viewProvider.getBaseLanguage() != PlainTextLanguage.INSTANCE ? PlainTextFileType.INSTANCE : viewProvider.getFileType();
   }
 
   @Override
diff --git a/python/src/com/jetbrains/commandInterface/commandLine/psi/CommandLineFile.java b/python/src/com/jetbrains/commandInterface/commandLine/psi/CommandLineFile.java
index 306e08bfd72a..f063a2b6db16 100644
--- a/python/src/com/jetbrains/commandInterface/commandLine/psi/CommandLineFile.java
+++ b/python/src/com/jetbrains/commandInterface/commandLine/psi/CommandLineFile.java
@@ -52,8 +52,7 @@ public final class CommandLineFile extends PsiFileBase implements CommandLinePar
   @NotNull
   @Override
   public FileType getFileType() {
-
-    return getViewProvider().getVirtualFile().getFileType();
+    return getViewProvider().getFileType();
   }
 
   @Nullable
diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/ExternalDocumentValidator.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/ExternalDocumentValidator.java
index 71ad2d55e107..7a14b4c6a015 100644
--- a/xml/xml-psi-impl/src/com/intellij/xml/impl/ExternalDocumentValidator.java
+++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/ExternalDocumentValidator.java
@@ -349,7 +349,7 @@ public class ExternalDocumentValidator {
       return;
     }
 
-    final FileType fileType = containingFile.getViewProvider().getVirtualFile().getFileType();
+    final FileType fileType = containingFile.getViewProvider().getFileType();
     if (fileType != XmlFileType.INSTANCE && fileType != XHtmlFileType.INSTANCE) {
       return;
     }
diff --git a/xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/HtmlStructureViewBuilderProvider.java b/xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/HtmlStructureViewBuilderProvider.java
index 91e17be3b451..4e333767cea4 100644
--- a/xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/HtmlStructureViewBuilderProvider.java
+++ b/xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/HtmlStructureViewBuilderProvider.java
@@ -29,7 +29,7 @@ public class HtmlStructureViewBuilderProvider implements XmlStructureViewBuilder
   @Override
   @Nullable
   public StructureViewBuilder createStructureViewBuilder(@NotNull final XmlFile file) {
-    if (file.getViewProvider().getVirtualFile().getFileType() != HtmlFileType.INSTANCE) return null;
+    if (file.getViewProvider().getFileType() != HtmlFileType.INSTANCE) return null;
 
     return new TreeBasedStructureViewBuilder() {
       @Override