diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index fa0c3a59eb1..103f2e208e4 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -1882,8 +1882,8 @@ bool matchName(const Name *name, QList<Core::LocatorFilterEntry> *matches, QStri
     if (!name)
         return false;
 
-    if (CppClassesFilter *classesFilter
-            = ExtensionSystem::PluginManager::getObject<CppClassesFilter>()) {
+    if (Core::ILocatorFilter *classesFilter
+            = CppTools::CppModelManager::instance()->classesFilter()) {
         QFutureInterface<Core::LocatorFilterEntry> dummy;
 
         const Overview oo;
diff --git a/src/plugins/cpptools/cpplocatorfilter_test.cpp b/src/plugins/cpptools/cpplocatorfilter_test.cpp
index 2759021956c..a9fc6e3405b 100644
--- a/src/plugins/cpptools/cpplocatorfilter_test.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter_test.cpp
@@ -96,7 +96,7 @@ class CppCurrentDocumentFilterTestCase
 public:
     CppCurrentDocumentFilterTestCase(const QString &fileName,
                                      const ResultDataList &expectedResults)
-        : BasicLocatorFilterTest(PluginManager::getObject<CppCurrentDocumentFilter>())
+        : BasicLocatorFilterTest(CppTools::CppModelManager::instance()->currentDocumentFilter())
         , m_editor(0)
         , m_fileName(fileName)
     {
@@ -158,9 +158,11 @@ void CppToolsPlugin::test_cpplocatorfilters_CppLocatorFilter_data()
     QTest::addColumn<QString>("searchText");
     QTest::addColumn<ResultDataList>("expectedResults");
 
-    ILocatorFilter *cppFunctionsFilter = PluginManager::getObject<CppFunctionsFilter>();
-    ILocatorFilter *cppClassesFilter = PluginManager::getObject<CppClassesFilter>();
-    ILocatorFilter *cppLocatorFilter = PluginManager::getObject<CppLocatorFilter>();
+    CppModelManager *cppModelManager = CppModelManager::instance();
+
+    ILocatorFilter *cppFunctionsFilter = cppModelManager->functionsFilter();
+    ILocatorFilter *cppClassesFilter = cppModelManager->classesFilter();
+    ILocatorFilter *cppLocatorFilter = cppModelManager->locatorFilter();
 
     MyTestDataDir testDirectory("testdata_basic");
     const QString testFile = testDirectory.file("file1.cpp");
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index eb02ac8892a..39348379702 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -390,6 +390,36 @@ void CppModelManager::setCurrentDocumentFilter(std::unique_ptr<Core::ILocatorFil
     setFilter(d->m_currentDocumentFilter, std::move(filter));
 }
 
+Core::ILocatorFilter *CppModelManager::locatorFilter() const
+{
+    return d->m_locatorFilter.get();
+}
+
+Core::ILocatorFilter *CppModelManager::classesFilter() const
+{
+    return d->m_classesFilter.get();
+}
+
+Core::ILocatorFilter *CppModelManager::includesFilter() const
+{
+    return d->m_includesFilter.get();
+}
+
+Core::ILocatorFilter *CppModelManager::functionsFilter() const
+{
+    return d->m_functionsFilter.get();
+}
+
+Core::IFindFilter *CppModelManager::symbolsFindFilter() const
+{
+    return d->m_symbolsFindFilter.get();
+}
+
+Core::ILocatorFilter *CppModelManager::currentDocumentFilter() const
+{
+    return d->m_currentDocumentFilter.get();
+}
+
 FollowSymbolInterface &CppModelManager::followSymbolInterface() const
 {
     return d->m_activeModelManagerSupport->followSymbolInterface();
diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h
index 425ab8712e3..aad73330732 100644
--- a/src/plugins/cpptools/cppmodelmanager.h
+++ b/src/plugins/cpptools/cppmodelmanager.h
@@ -219,6 +219,13 @@ public:
     void setSymbolsFindFilter(std::unique_ptr<Core::IFindFilter> &&filter);
     void setCurrentDocumentFilter(std::unique_ptr<Core::ILocatorFilter> &&filter);
 
+    Core::ILocatorFilter *locatorFilter() const;
+    Core::ILocatorFilter *classesFilter() const;
+    Core::ILocatorFilter *includesFilter() const;
+    Core::ILocatorFilter *functionsFilter() const;
+    Core::IFindFilter *symbolsFindFilter() const;
+    Core::ILocatorFilter *currentDocumentFilter() const;
+
     void renameIncludes(const QString &oldFileName, const QString &newFileName);
 
 signals:
diff --git a/src/plugins/modeleditor/elementtasks.cpp b/src/plugins/modeleditor/elementtasks.cpp
index 3ace1bec41c..f20134fb28c 100644
--- a/src/plugins/modeleditor/elementtasks.cpp
+++ b/src/plugins/modeleditor/elementtasks.cpp
@@ -108,7 +108,8 @@ bool ElementTasks::hasClassDefinition(const qmt::MElement *element) const
                 ? klass->name()
                 : klass->umlNamespace() + "::" + klass->name();
 
-        CppTools::CppClassesFilter *classesFilter = ExtensionSystem::PluginManager::getObject<CppTools::CppClassesFilter>();
+        Core::ILocatorFilter *classesFilter
+                = CppTools::CppModelManager::instance()->classesFilter();
         if (!classesFilter)
             return false;
 
@@ -144,7 +145,8 @@ void ElementTasks::openClassDefinition(const qmt::MElement *element)
                 ? klass->name()
                 : klass->umlNamespace() + "::" + klass->name();
 
-        CppTools::CppClassesFilter *classesFilter = ExtensionSystem::PluginManager::getObject<CppTools::CppClassesFilter>();
+        Core::ILocatorFilter *classesFilter
+                = CppTools::CppModelManager::instance()->classesFilter();
         if (!classesFilter)
             return;