diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
index b50d3995344..74a886b823e 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
@@ -1908,7 +1908,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
         if (funDescriptor instanceof SimpleFunctionDescriptor) {
             SimpleFunctionDescriptor original = ((SimpleFunctionDescriptor) funDescriptor).getOriginal();
             if (original instanceof SamConstructorDescriptor) {
-                return invokeSamConstructor(expression, resolvedCall, ((SamConstructorDescriptor) original).getSamInterface());
+                return invokeSamConstructor(expression, resolvedCall, ((SamConstructorDescriptor) original).getBaseForSynthesized());
             }
         }
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/SamCodegenUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/SamCodegenUtil.java
index 331c3c8d4b5..df3d6dda2ac 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/SamCodegenUtil.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/SamCodegenUtil.java
@@ -27,7 +27,7 @@ public class SamCodegenUtil {
     public static FunctionDescriptor getOriginalIfSamAdapter(@NotNull FunctionDescriptor fun) {
         FunctionDescriptor original = fun.getOriginal();
         if (original instanceof SamAdapterDescriptor<?>) {
-            return ((SamAdapterDescriptor) original).getDeclaration();
+            return ((SamAdapterDescriptor<?>) original).getBaseForSynthesized();
         }
 
         if (original.getKind() == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamAdapterDescriptor.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamAdapterDescriptor.java
index 83f270ef609..9e1149289ba 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamAdapterDescriptor.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamAdapterDescriptor.java
@@ -16,10 +16,8 @@
 
 package org.jetbrains.jet.lang.resolve.java.descriptor;
 
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
+import org.jetbrains.jet.lang.descriptors.SynthesizedCallableMemberDescriptor;
 
-public interface SamAdapterDescriptor<D extends FunctionDescriptor> extends FunctionDescriptor {
-    @NotNull
-    D getDeclaration();
+public interface SamAdapterDescriptor<D extends FunctionDescriptor> extends FunctionDescriptor, SynthesizedCallableMemberDescriptor<D> {
 }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.java
index 8f0c05eef34..33d9d363245 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.java
@@ -18,9 +18,11 @@ package org.jetbrains.jet.lang.resolve.java.descriptor;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor;
+import org.jetbrains.jet.lang.descriptors.SynthesizedCallableMemberDescriptor;
 import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl;
 
-public class SamConstructorDescriptor extends SimpleFunctionDescriptorImpl {
+public class SamConstructorDescriptor extends SimpleFunctionDescriptorImpl
+        implements SynthesizedCallableMemberDescriptor<ClassDescriptorFromJvmBytecode> {
     private final ClassDescriptorFromJvmBytecode samInterface;
 
     public SamConstructorDescriptor(
@@ -32,7 +34,8 @@ public class SamConstructorDescriptor extends SimpleFunctionDescriptorImpl {
     }
 
     @NotNull
-    public ClassDescriptorFromJvmBytecode getSamInterface() {
+    @Override
+    public ClassDescriptorFromJvmBytecode getBaseForSynthesized() {
         return samInterface;
     }
 }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java
index 7b753f51ec5..590e6129425 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java
@@ -223,11 +223,7 @@ public final class JavaConstructorResolver {
     }
 
     @Nullable
-    private ConstructorDescriptor resolveSamAdapter(@NotNull ConstructorDescriptor original) {
-        if (!isSamAdapterNecessary(original)) return null;
-
-        SamAdapterDescriptor<ConstructorDescriptor> adapter = createSamAdapterConstructor(original);
-        cache.recordSourceDescriptorForSynthesized(adapter, original);
-        return (ConstructorDescriptor) adapter;
+    private static ConstructorDescriptor resolveSamAdapter(@NotNull ConstructorDescriptor original) {
+        return isSamAdapterNecessary(original) ? (ConstructorDescriptor) createSamAdapterConstructor(original) : null;
     }
 }
\ No newline at end of file
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
index 44e357f5c88..8f974c441ce 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
@@ -26,7 +26,6 @@ import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils;
 import org.jetbrains.jet.lang.resolve.java.TypeUsage;
 import org.jetbrains.jet.lang.resolve.java.descriptor.ClassDescriptorFromJvmBytecode;
 import org.jetbrains.jet.lang.resolve.java.descriptor.JavaMethodDescriptor;
-import org.jetbrains.jet.lang.resolve.java.descriptor.SamAdapterDescriptor;
 import org.jetbrains.jet.lang.resolve.java.descriptor.SamConstructorDescriptor;
 import org.jetbrains.jet.lang.resolve.java.scope.NamedMembers;
 import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod;
@@ -271,34 +270,19 @@ public final class JavaFunctionResolver {
     }
 
     @Nullable
-    private SamConstructorDescriptor resolveSamConstructor(@NotNull NamespaceDescriptor owner, @NotNull NamedMembers namedMembers) {
+    public static SamConstructorDescriptor resolveSamConstructor(@NotNull NamespaceDescriptor owner, @NotNull NamedMembers namedMembers) {
         if (namedMembers.getSamInterface() != null) {
             ClassDescriptorFromJvmBytecode klass = findClassInNamespace(owner, namedMembers.getName());
             if (klass != null) {
-                SamConstructorDescriptor constructor = createSamConstructorFunction(owner, klass);
-                cache.recordSourceDescriptorForSynthesized(constructor, klass);
-                return constructor;
+                return createSamConstructorFunction(owner, klass);
             }
         }
         return null;
     }
 
     @Nullable
-    private SimpleFunctionDescriptor resolveSamAdapter(@NotNull SimpleFunctionDescriptor original) {
-        if (!isSamAdapterNecessary(original)) return null;
-
-        SamAdapterDescriptor<SimpleFunctionDescriptor> adapter = createSamAdapterFunction(original);
-        cache.recordSourceDescriptorForSynthesized(adapter, original);
-        return (SimpleFunctionDescriptor) adapter;
-    }
-
-    @NotNull
-    public Set<FunctionDescriptor> resolveFunctionGroupForPackage(@NotNull NamedMembers members, @NotNull NamespaceDescriptor owner) {
-        SamConstructorDescriptor samConstructor = resolveSamConstructor(owner, members);
-        if (samConstructor != null) {
-            return Collections.<FunctionDescriptor>singleton(samConstructor);
-        }
-        return Collections.emptySet();
+    private static SimpleFunctionDescriptor resolveSamAdapter(@NotNull SimpleFunctionDescriptor original) {
+        return isSamAdapterNecessary(original) ? (SimpleFunctionDescriptor) createSamAdapterFunction(original) : null;
     }
 
     @NotNull
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMemberResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMemberResolver.java
index 4fad0abf7ef..b309aa9c210 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMemberResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMemberResolver.java
@@ -75,11 +75,6 @@ public class JavaMemberResolver {
         return functionResolver.resolveFunctionGroupForClass(members, owner);
     }
 
-    @NotNull
-    public Set<FunctionDescriptor> resolveFunctionGroupForPackage(@NotNull NamedMembers members, @NotNull NamespaceDescriptor owner) {
-        return functionResolver.resolveFunctionGroupForPackage(members, owner);
-    }
-
     @NotNull
     public Set<VariableDescriptor> resolveFieldGroup(@NotNull NamedMembers members, @NotNull ClassOrNamespaceDescriptor ownerDescriptor) {
         return propertyResolver.resolveFieldGroup(members, ownerDescriptor);
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java
index 7723041a5be..470fcc14532 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java
@@ -26,8 +26,6 @@ import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 
 public interface JavaResolverCache {
-    void recordSourceDescriptorForSynthesized(@NotNull FunctionDescriptor synthesized, @NotNull DeclarationDescriptor source);
-
     @Nullable
     ClassDescriptor getClassResolvedFromSource(@NotNull FqName fqName);
 
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedJavaResolverCache.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedJavaResolverCache.java
index 417105340c2..c1692e80ce8 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedJavaResolverCache.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedJavaResolverCache.java
@@ -50,11 +50,6 @@ public class TraceBasedJavaResolverCache implements JavaResolverCache {
         this.trace = trace;
     }
 
-    @Override
-    public void recordSourceDescriptorForSynthesized(@NotNull FunctionDescriptor synthesized, @NotNull DeclarationDescriptor source) {
-        trace.record(SOURCE_DESCRIPTOR_FOR_SYNTHESIZED, synthesized, source);
-    }
-
     @Nullable
     @Override
     public ClassDescriptor getClassResolvedFromSource(@NotNull FqName fqName) {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterConstructorDescriptor.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterConstructorDescriptor.java
index 459cc1a1098..da64be565fb 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterConstructorDescriptor.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterConstructorDescriptor.java
@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.java.descriptor.SamAdapterDescriptor;
 
     @NotNull
     @Override
-    public ConstructorDescriptor getDeclaration() {
+    public ConstructorDescriptor getBaseForSynthesized() {
         return declaration;
     }
 }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterFunctionDescriptor.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterFunctionDescriptor.java
index 2d35b68fb81..5cbede4cb16 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterFunctionDescriptor.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterFunctionDescriptor.java
@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.java.descriptor.SamAdapterDescriptor;
 
     @NotNull
     @Override
-    public SimpleFunctionDescriptor getDeclaration() {
+    public SimpleFunctionDescriptor getBaseForSynthesized() {
         return declaration;
     }
 }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterOverridabilityCondition.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterOverridabilityCondition.java
index 3bff086fe3c..a83433138fe 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterOverridabilityCondition.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterOverridabilityCondition.java
@@ -60,7 +60,7 @@ public class SamAdapterOverridabilityCondition implements ExternalOverridability
             return null;
         }
 
-        SimpleFunctionDescriptor originalDeclarationOfSam = ((SamAdapterFunctionDescriptor) fun).getDeclaration();
+        SimpleFunctionDescriptor originalDeclarationOfSam = ((SamAdapterFunctionDescriptor) fun).getBaseForSynthesized();
 
         return ((SimpleFunctionDescriptor) originalDeclarationOfSam.substitute(TypeSubstitutor.create(declarationOrSynthesized.ownerType)));
     }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java
index 9e9f0f25c6b..bfed584f343 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java
@@ -19,6 +19,8 @@ package org.jetbrains.jet.lang.resolve.java.scope;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils;
+import org.jetbrains.jet.lang.resolve.java.descriptor.SamConstructorDescriptor;
+import org.jetbrains.jet.lang.resolve.java.resolver.JavaFunctionResolver;
 import org.jetbrains.jet.lang.resolve.java.resolver.JavaMemberResolver;
 import org.jetbrains.jet.lang.resolve.java.resolver.ProgressChecker;
 import org.jetbrains.jet.lang.resolve.java.structure.JavaClass;
@@ -126,7 +128,11 @@ public final class JavaPackageScope extends JavaBaseScope {
         if (members == null) {
             return Collections.emptySet();
         }
-        return memberResolver.resolveFunctionGroupForPackage(members, (NamespaceDescriptor) descriptor);
+        SamConstructorDescriptor samConstructor = JavaFunctionResolver.resolveSamConstructor((NamespaceDescriptor) descriptor, members);
+        if (samConstructor == null) {
+            return Collections.emptySet();
+        }
+        return Collections.<FunctionDescriptor>singleton(samConstructor);
     }
 
     @NotNull
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/SynthesizedCallableMemberDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/SynthesizedCallableMemberDescriptor.java
new file mode 100644
index 00000000000..733f17afdb6
--- /dev/null
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/SynthesizedCallableMemberDescriptor.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2013 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.
+ */
+
+package org.jetbrains.jet.lang.descriptors;
+
+import org.jetbrains.annotations.NotNull;
+
+public interface SynthesizedCallableMemberDescriptor<D extends DeclarationDescriptor> extends CallableMemberDescriptor {
+    @NotNull
+    D getBaseForSynthesized();
+}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java
index 8f792fe371c..c4fbd953666 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java
@@ -39,7 +39,6 @@ import org.jetbrains.jet.util.slicedmap.*;
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 
 import static org.jetbrains.jet.util.slicedmap.RewritePolicy.DO_NOTHING;
 
@@ -260,8 +259,6 @@ public interface BindingContext {
 
     WritableSlice<ClassDescriptor, Boolean> INCOMPLETE_HIERARCHY = Slices.createCollectiveSetSlice();
 
-    WritableSlice<CallableMemberDescriptor, DeclarationDescriptor> SOURCE_DESCRIPTOR_FOR_SYNTHESIZED = Slices.createSimpleSlice();
-
     @SuppressWarnings("UnusedDeclaration")
     @Deprecated // This field is needed only for the side effects of its initializer
             Void _static_initializer = BasicWritableSlice.initSliceDebugNames(BindingContext.class);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java
index 162a125d66c..7d57f8dfa16 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java
@@ -170,8 +170,12 @@ public class BindingContextUtils {
     @Nullable
     public static PsiElement callableDescriptorToDeclaration(@NotNull BindingContext context, @NotNull CallableMemberDescriptor callable) {
         if (callable.getKind() == CallableMemberDescriptor.Kind.SYNTHESIZED) {
-            DeclarationDescriptor source = context.get(BindingContext.SOURCE_DESCRIPTOR_FOR_SYNTHESIZED, callable);
-            return source != null ? descriptorToDeclaration(context, source) : null;
+            CallableMemberDescriptor original = callable.getOriginal();
+            if (original instanceof SynthesizedCallableMemberDescriptor<?>) {
+                DeclarationDescriptor base = ((SynthesizedCallableMemberDescriptor<?>) original).getBaseForSynthesized();
+                return descriptorToDeclaration(context, base);
+            }
+            return null;
         }
 
         if (callable.getKind() == CallableMemberDescriptor.Kind.DECLARATION) {
@@ -191,8 +195,12 @@ public class BindingContextUtils {
     @NotNull
     private static List<PsiElement> callableDescriptorToDeclarations(@NotNull BindingContext context, @NotNull CallableMemberDescriptor callable) {
         if (callable.getKind() == CallableMemberDescriptor.Kind.SYNTHESIZED) {
-            DeclarationDescriptor source = context.get(BindingContext.SOURCE_DESCRIPTOR_FOR_SYNTHESIZED, callable.getOriginal());
-            return source != null ? descriptorToDeclarations(context, source) : Collections.<PsiElement>emptyList();
+            CallableMemberDescriptor original = callable.getOriginal();
+            if (original instanceof SynthesizedCallableMemberDescriptor<?>) {
+                DeclarationDescriptor base = ((SynthesizedCallableMemberDescriptor<?>) original).getBaseForSynthesized();
+                return descriptorToDeclarations(context, base);
+            }
+            return Collections.emptyList();
         }
 
         if (callable.getKind() == CallableMemberDescriptor.Kind.DECLARATION) {