diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt
index 2afaa1d4fee..2c8e9de64a4 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt
@@ -60,6 +60,10 @@ public class KotlinCacheService(val project: Project) {
             override fun resolveToDescriptor(declaration: JetDeclaration): DeclarationDescriptor {
                 return cache.getLazyResolveSession(declaration).resolveToDescriptor(declaration)
             }
+
+            override fun analyzeFullyAndGetResult(elements: Collection<JetElement>): AnalysisResult {
+                return cache.getAnalysisResultsForElements(elements)
+            }
         }
     }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt
index 6b41f68362d..47320c89a79 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt
@@ -21,11 +21,14 @@ import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
 import org.jetbrains.jet.lang.psi.JetDeclaration
+import org.jetbrains.jet.analyzer.AnalysisResult
 
 public trait ResolutionFacade {
 
     public fun analyze(element: JetElement): BindingContext
 
+    public fun analyzeFullyAndGetResult(elements: Collection<JetElement>): AnalysisResult
+
     public fun resolveToDescriptor(declaration: JetDeclaration): DeclarationDescriptor
 
     public fun findModuleDescriptor(element: JetElement): ModuleDescriptor
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt
index 4a18529cd54..0308af60552 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt
@@ -50,5 +50,5 @@ public fun JetElement.analyzeFully(): BindingContext {
 }
 
 public fun JetElement.analyzeFullyAndGetResult(vararg extraFiles: JetFile): AnalysisResult {
-    return KotlinCacheService.getInstance(getProject()).getAnalysisResults(listOf(this) + extraFiles.toList())
+    return KotlinCacheService.getInstance(getProject()).getResolutionFacade(listOf(this) + extraFiles.toList()).analyzeFullyAndGetResult(listOf(this))
 }