diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index cf823377172..c511c0cafa0 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -64,7 +64,7 @@ namespace Internal {
 ClangEditorDocumentProcessor::ClangEditorDocumentProcessor(
         IpcCommunicator &ipcCommunicator,
         TextEditor::TextDocument *document)
-    : BaseEditorDocumentProcessor(document)
+    : BaseEditorDocumentProcessor(document->document(), document->filePath().toString())
     , m_diagnosticManager(document)
     , m_ipcCommunicator(ipcCommunicator)
     , m_parser(new ClangEditorDocumentParser(document->filePath().toString()))
@@ -344,7 +344,7 @@ ClangEditorDocumentProcessor::fileContainerWithDocumentContent(const QString &pr
 {
     return ClangBackEnd::FileContainer(filePath(),
                                        projectpartId,
-                                       baseTextDocument()->plainText(),
+                                       textDocument()->toPlainText(),
                                        true,
                                        revision());
 }
diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.cpp b/src/plugins/cpptools/baseeditordocumentprocessor.cpp
index 462f8137fd7..e90a64dbd0f 100644
--- a/src/plugins/cpptools/baseeditordocumentprocessor.cpp
+++ b/src/plugins/cpptools/baseeditordocumentprocessor.cpp
@@ -45,9 +45,10 @@ namespace CppTools {
            semantic calculations) after a text document has changed.
 */
 
-BaseEditorDocumentProcessor::BaseEditorDocumentProcessor(
-        TextEditor::TextDocument *document)
-    : m_baseTextDocument(document)
+BaseEditorDocumentProcessor::BaseEditorDocumentProcessor(QTextDocument *textDocument,
+                                                         const QString &filePath)
+    : m_filePath(filePath),
+      m_textDocument(textDocument)
 {
 }
 
@@ -55,11 +56,6 @@ BaseEditorDocumentProcessor::~BaseEditorDocumentProcessor()
 {
 }
 
-TextEditor::TextDocument *BaseEditorDocumentProcessor::baseTextDocument() const
-{
-    return m_baseTextDocument;
-}
-
 TextEditor::QuickFixOperations
 BaseEditorDocumentProcessor::extraRefactoringOperations(const TextEditor::AssistInterface &)
 {
diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.h b/src/plugins/cpptools/baseeditordocumentprocessor.h
index 9dffaa297e7..353a980f113 100644
--- a/src/plugins/cpptools/baseeditordocumentprocessor.h
+++ b/src/plugins/cpptools/baseeditordocumentprocessor.h
@@ -55,11 +55,9 @@ class CPPTOOLS_EXPORT BaseEditorDocumentProcessor : public QObject
     Q_OBJECT
 
 public:
-    BaseEditorDocumentProcessor(TextEditor::TextDocument *document);
+    BaseEditorDocumentProcessor(QTextDocument *textDocument, const QString &filePath);
     virtual ~BaseEditorDocumentProcessor();
 
-    TextEditor::TextDocument *baseTextDocument() const;
-
     // Function interface to implement
     virtual void run() = 0;
     virtual void semanticRehighlight() = 0;
@@ -92,12 +90,13 @@ protected:
                           const CppTools::WorkingCopy workingCopy);
 
     // Convenience
-    QString filePath() const { return m_baseTextDocument->filePath().toString(); }
-    unsigned revision() const { return static_cast<unsigned>(textDocument()->revision()); }
-    QTextDocument *textDocument() const { return m_baseTextDocument->document(); }
+    QString filePath() const { return m_filePath; }
+    unsigned revision() const { return static_cast<unsigned>(m_textDocument->revision()); }
+    QTextDocument *textDocument() const { return m_textDocument; }
 
 private:
-    TextEditor::TextDocument *m_baseTextDocument;
+    QString m_filePath;
+    QTextDocument *m_textDocument;
 };
 
 } // namespace CppTools
diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.cpp b/src/plugins/cpptools/builtineditordocumentprocessor.cpp
index 826b7b24a2c..c0d7b9861e4 100644
--- a/src/plugins/cpptools/builtineditordocumentprocessor.cpp
+++ b/src/plugins/cpptools/builtineditordocumentprocessor.cpp
@@ -166,7 +166,7 @@ namespace CppTools {
 BuiltinEditorDocumentProcessor::BuiltinEditorDocumentProcessor(
         TextEditor::TextDocument *document,
         bool enableSemanticHighlighter)
-    : BaseEditorDocumentProcessor(document)
+    : BaseEditorDocumentProcessor(document->document(), document->filePath().toString())
     , m_parser(new BuiltinEditorDocumentParser(document->filePath().toString()))
     , m_codeWarningsUpdated(false)
     , m_semanticHighlighter(enableSemanticHighlighter
@@ -186,7 +186,7 @@ BuiltinEditorDocumentProcessor::BuiltinEditorDocumentProcessor(
             [this]() -> QFuture<TextEditor::HighlightingResult> {
                 const SemanticInfo semanticInfo = m_semanticInfoUpdater.semanticInfo();
                 CheckSymbols *checkSymbols = createHighlighter(semanticInfo.doc, semanticInfo.snapshot,
-                                                               baseTextDocument()->document());
+                                                               textDocument());
                 QTC_ASSERT(checkSymbols, return QFuture<TextEditor::HighlightingResult>());
                 connect(checkSymbols, &CheckSymbols::codeWarningsUpdated,
                         this, &BuiltinEditorDocumentProcessor::onCodeWarningsUpdated);