diff --git a/platform/platform-resources/src/META-INF/ExternalSystemExtensions.xml b/platform/platform-resources/src/META-INF/ExternalSystemExtensions.xml
index c792fb3b018a..2f6eadde7a05 100644
--- a/platform/platform-resources/src/META-INF/ExternalSystemExtensions.xml
+++ b/platform/platform-resources/src/META-INF/ExternalSystemExtensions.xml
@@ -27,7 +27,8 @@
     <projectService serviceInterface="com.intellij.openapi.externalSystem.service.project.manage.ExternalProjectsManager"
                     serviceImplementation="com.intellij.openapi.externalSystem.service.project.manage.ExternalProjectsManagerImpl"
                     order="first"/>
-    <projectService serviceImplementation="com.intellij.openapi.project.ExternalStorageConfigurationManager"/>
+    <projectService serviceInterface="com.intellij.openapi.project.ExternalStorageConfigurationManager"
+                    serviceImplementation="com.intellij.openapi.project.ExternalStorageConfigurationManagerImpl"/>
     <projectService serviceImplementation="com.intellij.openapi.externalSystem.service.project.manage.ExternalProjectsDataStorage"/>
     <projectService serviceImplementation="com.intellij.openapi.externalSystem.service.project.ExternalProjectsWorkspaceImpl"/>
     <externalProjectDataService implementation="com.intellij.openapi.externalSystem.service.project.manage.ProjectDataServiceImpl"/>
diff --git a/platform/projectModel-api/src/com/intellij/openapi/project/ExternalStorageConfigurationManager.java b/platform/projectModel-api/src/com/intellij/openapi/project/ExternalStorageConfigurationManager.java
new file mode 100644
index 000000000000..866ccdb53bcb
--- /dev/null
+++ b/platform/projectModel-api/src/com/intellij/openapi/project/ExternalStorageConfigurationManager.java
@@ -0,0 +1,13 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.intellij.openapi.project;
+
+import com.intellij.openapi.components.ServiceManager;
+
+public interface ExternalStorageConfigurationManager {
+  static ExternalStorageConfigurationManager getInstance(Project project) {
+    return ServiceManager.getService(project, ExternalStorageConfigurationManager.class);
+  }
+
+  boolean isEnabled();
+  void setEnabled(boolean value);
+}
diff --git a/platform/projectModel-api/src/com/intellij/openapi/project/ExternalStorageConfigurationManager.kt b/platform/projectModel-api/src/com/intellij/openapi/project/ExternalStorageConfigurationManagerImpl.kt
similarity index 73%
rename from platform/projectModel-api/src/com/intellij/openapi/project/ExternalStorageConfigurationManager.kt
rename to platform/projectModel-api/src/com/intellij/openapi/project/ExternalStorageConfigurationManagerImpl.kt
index e2e0e816b389..44fe9ea253d0 100644
--- a/platform/projectModel-api/src/com/intellij/openapi/project/ExternalStorageConfigurationManager.kt
+++ b/platform/projectModel-api/src/com/intellij/openapi/project/ExternalStorageConfigurationManagerImpl.kt
@@ -14,12 +14,7 @@ class ExternalStorageConfiguration : BaseState() {
 }
 
 @State(name = "ExternalStorageConfigurationManager")
-class ExternalStorageConfigurationManager : PersistentStateComponent<ExternalStorageConfiguration>, ModificationTracker {
-  companion object {
-    @JvmStatic
-    fun getInstance(project: Project): ExternalStorageConfigurationManager = ServiceManager.getService(project, ExternalStorageConfigurationManager::class.java)
-  }
-
+class ExternalStorageConfigurationManagerImpl : PersistentStateComponent<ExternalStorageConfiguration>, ModificationTracker, ExternalStorageConfigurationManager {
   private var state = ExternalStorageConfiguration()
 
   override fun getModificationCount(): Long = state.modificationCount
@@ -32,12 +27,12 @@ class ExternalStorageConfigurationManager : PersistentStateComponent<ExternalSto
     this.state = state
   }
 
-  fun isEnabled(): Boolean = state.enabled
+  override fun isEnabled(): Boolean = state.enabled
 
   /**
    * Internal use only. Call ExternalProjectsManagerImpl.setStoreExternally instead.
    */
-  fun setEnabled(value: Boolean) {
+  override fun setEnabled(value: Boolean) {
     state.enabled = value
   }
 }
\ No newline at end of file