diff --git a/json/src/com/jetbrains/jsonSchema/JsonSchemaMappingsProjectConfiguration.java b/json/src/com/jetbrains/jsonSchema/JsonSchemaMappingsProjectConfiguration.java
index fbbabd07dfa3..cf5ec903a304 100644
--- a/json/src/com/jetbrains/jsonSchema/JsonSchemaMappingsProjectConfiguration.java
+++ b/json/src/com/jetbrains/jsonSchema/JsonSchemaMappingsProjectConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2017 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.
+ * 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.jetbrains.jsonSchema;
 
@@ -22,13 +22,15 @@ import java.util.TreeMap;
 
 @State(name = "JsonSchemaMappingsProjectConfiguration", storages = @Storage("jsonSchemas.xml"))
 public class JsonSchemaMappingsProjectConfiguration implements PersistentStateComponent<JsonSchemaMappingsProjectConfiguration.MyState> {
+  @NotNull private final Project myProject;
   public volatile MyState myState = new MyState();
 
   public static JsonSchemaMappingsProjectConfiguration getInstance(@NotNull final Project project) {
     return ServiceManager.getService(project, JsonSchemaMappingsProjectConfiguration.class);
   }
 
-  public JsonSchemaMappingsProjectConfiguration() {
+  public JsonSchemaMappingsProjectConfiguration(@NotNull Project project) {
+    myProject = project;
   }
 
   @Nullable
@@ -54,8 +56,9 @@ public class JsonSchemaMappingsProjectConfiguration implements PersistentStateCo
   }
 
   @Override
-  public void loadState(MyState state) {
+  public void loadState(@NotNull MyState state) {
     myState = state;
+    JsonSchemaService.Impl.get(myProject).reset();
   }
 
   public void setState(@NotNull Map<String, UserDefinedJsonSchemaConfiguration> state) {
diff --git a/json/tests/test/com/jetbrains/jsonSchema/schemaFile/TestJsonSchemaMappingsProjectConfiguration.java b/json/tests/test/com/jetbrains/jsonSchema/schemaFile/TestJsonSchemaMappingsProjectConfiguration.java
index 8663d4e31a2b..977698e0f73b 100644
--- a/json/tests/test/com/jetbrains/jsonSchema/schemaFile/TestJsonSchemaMappingsProjectConfiguration.java
+++ b/json/tests/test/com/jetbrains/jsonSchema/schemaFile/TestJsonSchemaMappingsProjectConfiguration.java
@@ -1,27 +1,16 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.jetbrains.jsonSchema.schemaFile;
 
+import com.intellij.openapi.project.Project;
 import com.jetbrains.jsonSchema.JsonSchemaMappingsProjectConfiguration;
 
 /**
  * @author Irina.Chernushina on 4/1/2016.
  */
 public class TestJsonSchemaMappingsProjectConfiguration extends JsonSchemaMappingsProjectConfiguration {
-  public TestJsonSchemaMappingsProjectConfiguration() {
-    super();
+  public TestJsonSchemaMappingsProjectConfiguration(Project project) {
+    super(project);
   }
 }