diff --git a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt
index 013146183d9..4526ff61d06 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt
@@ -32,14 +32,15 @@ import java.util.*
 class PartialBodyResolveFilter(
         elementsToResolve: Collection<KtElement>,
         private val declaration: KtDeclaration,
-        probablyNothingCallableNames: ProbablyNothingCallableNames,
         forCompletion: Boolean
 ) : StatementFilter() {
 
     private val statementMarks = StatementMarks()
 
-    private val nothingFunctionNames = HashSet(probablyNothingCallableNames.functionNames())
-    private val nothingVariableNames = HashSet(probablyNothingCallableNames.propertyNames())
+    private val globalProbablyNothingCallableNames = ProbablyNothingCallableNames.getInstance(declaration.project)
+
+    private val contextNothingFunctionNames = HashSet<String>()
+    private val contextNothingVariableNames = HashSet<String>()
 
     override val filter: ((KtExpression) -> Boolean)? = { statementMarks.statementMark(it) != MarkLevel.NONE }
 
@@ -55,10 +56,10 @@ class PartialBodyResolveFilter(
                 val name = declaration.name
                 if (name != null) {
                     if (declaration is KtNamedFunction) {
-                        nothingFunctionNames.add(name)
+                        contextNothingFunctionNames.add(name)
                     }
                     else {
-                        nothingVariableNames.add(name)
+                        contextNothingVariableNames.add(name)
                     }
                 }
             }
@@ -399,7 +400,7 @@ class PartialBodyResolveFilter(
 
             override fun visitCallExpression(expression: KtCallExpression) {
                 val name = (expression.calleeExpression as? KtSimpleNameExpression)?.getReferencedName()
-                if (name != null && name in nothingFunctionNames) {
+                if (name != null && (name in globalProbablyNothingCallableNames.functionNames() || name in contextNothingFunctionNames)) {
                     result.add(expression)
                 }
                 super.visitCallExpression(expression)
@@ -407,7 +408,7 @@ class PartialBodyResolveFilter(
 
             override fun visitSimpleNameExpression(expression: KtSimpleNameExpression) {
                 val name = expression.getReferencedName()
-                if (name in nothingVariableNames) {
+                if (name in globalProbablyNothingCallableNames.propertyNames() || name in contextNothingVariableNames) {
                     result.add(expression)
                 }
             }
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ProbablyNothingCallableNames.kt b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ProbablyNothingCallableNames.kt
index bef813d1b43..8a3cf2b2578 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ProbablyNothingCallableNames.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ProbablyNothingCallableNames.kt
@@ -16,7 +16,14 @@
 
 package org.jetbrains.kotlin.resolve.lazy
 
+import com.intellij.openapi.components.ServiceManager
+import com.intellij.openapi.project.Project
+
 interface ProbablyNothingCallableNames {
     fun functionNames(): Collection<String>
     fun propertyNames(): Collection<String>
+
+    companion object {
+        fun getInstance(project: Project) = ServiceManager.getService(project, ProbablyNothingCallableNames::class.java)!!
+    }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ProbablyNothingCallableNamesImpl.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ProbablyNothingCallableNamesImpl.kt
new file mode 100644
index 00000000000..f7885461039
--- /dev/null
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ProbablyNothingCallableNamesImpl.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010-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/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.project
+
+import com.intellij.openapi.project.Project
+import com.intellij.psi.util.CachedValueProvider
+import com.intellij.psi.util.CachedValuesManager
+import com.intellij.psi.util.PsiModificationTracker
+import com.intellij.util.containers.SLRUCache
+import org.jetbrains.kotlin.idea.caches.project.getModuleInfo
+import org.jetbrains.kotlin.idea.caches.resolve.PerFileAnalysisCache
+import org.jetbrains.kotlin.idea.stubindex.KotlinProbablyNothingFunctionShortNameIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinProbablyNothingPropertyShortNameIndex
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.resolve.lazy.ProbablyNothingCallableNames
+
+class ProbablyNothingCallableNamesImpl(project: Project) : ProbablyNothingCallableNames {
+    private val functionNames = createCachedValue(project) { KotlinProbablyNothingFunctionShortNameIndex.getInstance().getAllKeys(project) }
+    private val propertyNames = createCachedValue(project) { KotlinProbablyNothingPropertyShortNameIndex.getInstance().getAllKeys(project) }
+
+    override fun functionNames(): Collection<String> = functionNames.value
+    override fun propertyNames(): Collection<String> = propertyNames.value
+}
+
+private inline fun createCachedValue(project: Project, crossinline names: () -> Collection<String>) =
+    CachedValuesManager.getManager(project).createCachedValue(
+        {
+            CachedValueProvider.Result.create(names(), PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT)
+        }, false
+    )
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
index 6cfc43274cb..4a4bfddc21d 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
@@ -111,14 +111,6 @@ class ResolveElementCache(
             false
         )
 
-
-    private fun probablyNothingCallableNames(): ProbablyNothingCallableNames {
-        return object : ProbablyNothingCallableNames {
-            override fun functionNames() = KotlinProbablyNothingFunctionShortNameIndex.getInstance().getAllKeys(project)
-            override fun propertyNames() = KotlinProbablyNothingPropertyShortNameIndex.getInstance().getAllKeys(project)
-        }
-    }
-
     override fun resolveFunctionBody(function: KtNamedFunction) = getElementsAdditionalResolve(function, null, BodyResolveMode.FULL)
 
     fun resolvePrimaryConstructorParametersDefaultValues(ktClass: KtClass): BindingContext {
@@ -310,7 +302,6 @@ class ResolveElementCache(
                 statementFilterUsed = PartialBodyResolveFilter(
                     contextElements!!,
                     resolveElement as KtDeclaration,
-                    probablyNothingCallableNames(),
                     bodyResolveMode == BodyResolveMode.PARTIAL_FOR_COMPLETION
                 )
             }
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 8308eceb8b2..ab2a222e3d9 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -349,6 +349,9 @@
     <projectService serviceInterface="org.jetbrains.kotlin.idea.core.script.ScriptModificationListener"
                     serviceImplementation="org.jetbrains.kotlin.idea.core.script.ScriptModificationListener"/>
 
+    <projectService serviceInterface="org.jetbrains.kotlin.resolve.lazy.ProbablyNothingCallableNames"
+                    serviceImplementation="org.jetbrains.kotlin.idea.project.ProbablyNothingCallableNamesImpl"/>
+
     <errorHandler implementation="org.jetbrains.kotlin.idea.reporter.KotlinReportSubmitter"/>
 
     <internalFileTemplate name="Kotlin File"/>
@@ -2691,7 +2694,7 @@
                      level="WARNING"
                      language="kotlin"
     />
-    
+
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.SortModifiersInspection"
                      displayName="Non-canonical modifier order"
                      groupPath="Kotlin"
diff --git a/idea/src/META-INF/plugin.xml.172 b/idea/src/META-INF/plugin.xml.172
index b88f001c5df..3dedcd701e4 100644
--- a/idea/src/META-INF/plugin.xml.172
+++ b/idea/src/META-INF/plugin.xml.172
@@ -349,6 +349,9 @@
     <projectService serviceInterface="org.jetbrains.kotlin.idea.core.script.ScriptModificationListener"
                     serviceImplementation="org.jetbrains.kotlin.idea.core.script.ScriptModificationListener"/>
 
+    <projectService serviceInterface="org.jetbrains.kotlin.resolve.lazy.ProbablyNothingCallableNames"
+                    serviceImplementation="org.jetbrains.kotlin.idea.project.ProbablyNothingCallableNamesImpl"/>
+
     <errorHandler implementation="org.jetbrains.kotlin.idea.reporter.KotlinReportSubmitter"/>
 
     <internalFileTemplate name="Kotlin File"/>
@@ -2691,7 +2694,7 @@
                      level="WARNING"
                      language="kotlin"
     />
-    
+
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.SortModifiersInspection"
                      displayName="Non-canonical modifier order"
                      groupPath="Kotlin"
diff --git a/idea/src/META-INF/plugin.xml.173 b/idea/src/META-INF/plugin.xml.173
index c96669475fd..92f44b0b6a6 100644
--- a/idea/src/META-INF/plugin.xml.173
+++ b/idea/src/META-INF/plugin.xml.173
@@ -349,6 +349,9 @@
     <projectService serviceInterface="org.jetbrains.kotlin.idea.core.script.ScriptModificationListener"
                     serviceImplementation="org.jetbrains.kotlin.idea.core.script.ScriptModificationListener"/>
 
+    <projectService serviceInterface="org.jetbrains.kotlin.resolve.lazy.ProbablyNothingCallableNames"
+                    serviceImplementation="org.jetbrains.kotlin.idea.project.ProbablyNothingCallableNamesImpl"/>
+
     <errorHandler implementation="org.jetbrains.kotlin.idea.reporter.KotlinReportSubmitter"/>
 
     <internalFileTemplate name="Kotlin File"/>
@@ -2692,7 +2695,7 @@
                      level="WARNING"
                      language="kotlin"
     />
-    
+
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.SortModifiersInspection"
                      displayName="Non-canonical modifier order"
                      groupPath="Kotlin"
diff --git a/idea/src/META-INF/plugin.xml.182 b/idea/src/META-INF/plugin.xml.182
index d2eb34e511a..31a0249849b 100644
--- a/idea/src/META-INF/plugin.xml.182
+++ b/idea/src/META-INF/plugin.xml.182
@@ -350,6 +350,9 @@
     <projectService serviceInterface="org.jetbrains.kotlin.idea.core.script.ScriptModificationListener"
                     serviceImplementation="org.jetbrains.kotlin.idea.core.script.ScriptModificationListener"/>
 
+    <projectService serviceInterface="org.jetbrains.kotlin.resolve.lazy.ProbablyNothingCallableNames"
+                    serviceImplementation="org.jetbrains.kotlin.idea.project.ProbablyNothingCallableNamesImpl"/>
+
     <errorHandler implementation="org.jetbrains.kotlin.idea.reporter.KotlinReportSubmitter"/>
 
     <internalFileTemplate name="Kotlin File"/>
@@ -2692,7 +2695,7 @@
                      level="WARNING"
                      language="kotlin"
     />
-    
+
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.SortModifiersInspection"
                      displayName="Non-canonical modifier order"
                      groupPath="Kotlin"
diff --git a/idea/src/META-INF/plugin.xml.as31 b/idea/src/META-INF/plugin.xml.as31
index 39f652ecdd1..9fd9279a8df 100644
--- a/idea/src/META-INF/plugin.xml.as31
+++ b/idea/src/META-INF/plugin.xml.as31
@@ -349,6 +349,9 @@
     <projectService serviceInterface="org.jetbrains.kotlin.idea.core.script.ScriptModificationListener"
                     serviceImplementation="org.jetbrains.kotlin.idea.core.script.ScriptModificationListener"/>
 
+    <projectService serviceInterface="org.jetbrains.kotlin.resolve.lazy.ProbablyNothingCallableNames"
+                    serviceImplementation="org.jetbrains.kotlin.idea.project.ProbablyNothingCallableNamesImpl"/>
+
     <errorHandler implementation="org.jetbrains.kotlin.idea.reporter.KotlinReportSubmitter"/>
 
     <internalFileTemplate name="Kotlin File"/>
@@ -2691,7 +2694,7 @@
                      level="WARNING"
                      language="kotlin"
     />
-    
+
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.SortModifiersInspection"
                      displayName="Non-canonical modifier order"
                      groupPath="Kotlin"
diff --git a/idea/src/META-INF/plugin.xml.as32 b/idea/src/META-INF/plugin.xml.as32
index 42ef909fd71..53a9f3d769d 100644
--- a/idea/src/META-INF/plugin.xml.as32
+++ b/idea/src/META-INF/plugin.xml.as32
@@ -349,6 +349,9 @@
     <projectService serviceInterface="org.jetbrains.kotlin.idea.core.script.ScriptModificationListener"
                     serviceImplementation="org.jetbrains.kotlin.idea.core.script.ScriptModificationListener"/>
 
+    <projectService serviceInterface="org.jetbrains.kotlin.resolve.lazy.ProbablyNothingCallableNames"
+                    serviceImplementation="org.jetbrains.kotlin.idea.project.ProbablyNothingCallableNamesImpl"/>
+
     <errorHandler implementation="org.jetbrains.kotlin.idea.reporter.KotlinReportSubmitter"/>
 
     <internalFileTemplate name="Kotlin File"/>
@@ -2691,7 +2694,7 @@
                      level="WARNING"
                      language="kotlin"
     />
-    
+
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.SortModifiersInspection"
                      displayName="Non-canonical modifier order"
                      groupPath="Kotlin"