diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliLightClassGenerationSupport.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliLightClassGenerationSupport.java
index 033b6606271..8bbe4568f8c 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliLightClassGenerationSupport.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliLightClassGenerationSupport.java
@@ -16,15 +16,29 @@
 
 package org.jetbrains.jet.cli.jvm.compiler;
 
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.search.PsiSearchScopeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.asJava.LightClassConstructionContext;
 import org.jetbrains.jet.asJava.LightClassGenerationSupport;
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
+import org.jetbrains.jet.lang.psi.JetClassOrObject;
 import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.resolve.BindingContext;
+import org.jetbrains.jet.lang.resolve.BindingContextUtils;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.BindingTraceContext;
+import org.jetbrains.jet.lang.resolve.name.FqName;
+
+import java.util.Collection;
+import java.util.Collections;
 
 /**
  * This class solves the problem of interdependency between analyzing Kotlin code and generating JetLightClasses
@@ -67,4 +81,35 @@ public class CliLightClassGenerationSupport extends LightClassGenerationSupport
     public LightClassConstructionContext analyzeRelevantCode(@NotNull JetFile file) {
         return new LightClassConstructionContext(getTrace().getBindingContext(), null);
     }
+
+    @NotNull
+    @Override
+    public Collection<JetClassOrObject> findClassOrObjectDeclarations(@NotNull FqName fqName, @NotNull GlobalSearchScope searchScope) {
+        ClassDescriptor classDescriptor = trace.get(BindingContext.FQNAME_TO_CLASS_DESCRIPTOR, fqName);
+        if (classDescriptor != null) {
+            PsiElement element = BindingContextUtils.classDescriptorToDeclaration(trace.getBindingContext(), classDescriptor);
+            if (element != null && PsiSearchScopeUtil.isInScope(searchScope, element)) {
+                return Collections.singletonList((JetClassOrObject) element);
+            }
+        }
+        return Collections.emptyList();
+    }
+
+    @NotNull
+    @Override
+    public Collection<JetFile> findFilesForPackage(@NotNull FqName fqName, @NotNull final GlobalSearchScope searchScope) {
+        NamespaceDescriptor namespaceDescriptor = trace.get(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, fqName);
+        if (namespaceDescriptor != null) {
+            Collection<JetFile> files = trace.get(BindingContext.NAMESPACE_TO_FILES, namespaceDescriptor);
+            if (files != null) {
+                return Collections2.filter(files, new Predicate<JetFile>() {
+                    @Override
+                    public boolean apply(JetFile input) {
+                        return PsiSearchScopeUtil.isInScope(searchScope, input);
+                    }
+                });
+            }
+        }
+        return Collections.emptyList();
+    }
 }
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassGenerationSupport.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassGenerationSupport.java
index 2f921924ac5..47095b0ff6c 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassGenerationSupport.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassGenerationSupport.java
@@ -18,8 +18,13 @@ package org.jetbrains.jet.asJava;
 
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
+import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.psi.JetClassOrObject;
 import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.resolve.name.FqName;
+
+import java.util.Collection;
 
 public abstract class LightClassGenerationSupport {
 
@@ -30,4 +35,13 @@ public abstract class LightClassGenerationSupport {
 
     @NotNull
     public abstract LightClassConstructionContext analyzeRelevantCode(@NotNull JetFile file);
+
+    @NotNull
+    public abstract Collection<JetClassOrObject> findClassOrObjectDeclarations(@NotNull FqName fqName, @NotNull GlobalSearchScope searchScope);
+
+    /*
+     * Returns empty collection for absent package
+     */
+    @NotNull
+    public abstract Collection<JetFile> findFilesForPackage(@NotNull FqName fqName, @NotNull GlobalSearchScope searchScope);
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java b/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java
index 4990ef7833c..2bbd0781181 100644
--- a/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java
+++ b/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java
@@ -17,12 +17,26 @@
 package org.jetbrains.jet.plugin.caches.resolve;
 
 import com.intellij.openapi.project.Project;
+import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.asJava.LightClassConstructionContext;
 import org.jetbrains.jet.asJava.LightClassGenerationSupport;
+import org.jetbrains.jet.lang.psi.JetClassOrObject;
 import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.resolve.name.FqName;
+import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex;
+import org.jetbrains.jet.plugin.stubindex.JetPackageDeclarationIndex;
+
+import java.util.Collection;
 
 public class IDELightClassGenerationSupport extends LightClassGenerationSupport {
+
+    private final Project project;
+
+    public IDELightClassGenerationSupport(@NotNull Project project) {
+        this.project = project;
+    }
+
     @NotNull
     @Override
     public LightClassConstructionContext analyzeRelevantCode(@NotNull JetFile file) {
@@ -30,4 +44,16 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport
         KotlinDeclarationsCache cache = KotlinCacheManager.getInstance(project).getDeclarationsFromProject(project);
         return new LightClassConstructionContext(cache.getBindingContext(), null);
     }
+
+    @NotNull
+    @Override
+    public Collection<JetClassOrObject> findClassOrObjectDeclarations(@NotNull FqName fqName, @NotNull GlobalSearchScope searchScope) {
+        return JetFullClassNameIndex.getInstance().get(fqName.getFqName(), project, searchScope);
+    }
+
+    @NotNull
+    @Override
+    public Collection<JetFile> findFilesForPackage(@NotNull FqName fqName, @NotNull GlobalSearchScope searchScope) {
+        return JetPackageDeclarationIndex.getInstance().get(fqName.getFqName(), project, searchScope);
+    }
 }