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 b7481fa1aad..2afaa1d4fee 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
@@ -173,6 +173,8 @@ public class KotlinCacheService(val project: Project) {
     }
 
     public fun getAnalysisResults(elements: Collection<JetElement>): AnalysisResult {
+        if (elements.isEmpty()) return AnalysisResult.EMPTY
+
         val files = elements.map { it.getContainingJetFile() }.toSet()
         assertAreInSameModule(files)
 
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 c8726423477..346db14861a 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
@@ -52,9 +52,3 @@ public fun JetElement.analyzeFully(): BindingContext {
 public fun JetElement.analyzeFullyAndGetResult(vararg extraFiles: JetFile): AnalysisResult {
     return KotlinCacheService.getInstance(getProject()).getAnalysisResults(listOf(this) + extraFiles.toList())
 }
-
-public fun getAnalysisResultsForElements(elements: Collection<JetElement>): AnalysisResult {
-    if (elements.isEmpty()) return AnalysisResult.EMPTY
-    val element = elements.first()
-    return KotlinCacheService.getInstance(element.getProject()).getAnalysisResults(elements)
-}
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java
index bc70172813e..c72fb74f455 100644
--- a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java
+++ b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java
@@ -59,6 +59,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.types.lang.InlineStrategy;
 import org.jetbrains.jet.lang.types.lang.InlineUtil;
 import org.jetbrains.jet.plugin.caches.resolve.IdeaModuleInfo;
+import org.jetbrains.jet.plugin.caches.resolve.KotlinCacheService;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils;
 import org.jetbrains.jet.plugin.util.DebuggerUtils;
@@ -325,7 +326,7 @@ public class JetPositionManager implements PositionManager {
                     GlobalSearchScope packageFacadeScope = key.second.contentScope();
                     Collection<JetFile> packageFiles = findFilesWithExactPackage(key.first, packageFacadeScope, project);
 
-                    AnalysisResult analysisResult = ResolvePackage.getAnalysisResultsForElements(packageFiles);
+                    AnalysisResult analysisResult = KotlinCacheService.OBJECT$.getInstance(project).getAnalysisResults(packageFiles);
                     analysisResult.throwIfError();
 
                     GenerationState state = new GenerationState(project, ClassBuilderFactories.THROW_EXCEPTION,