diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt
index 5f64736070c..0ed050a9eac 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt
@@ -97,7 +97,7 @@ class LazyJavaClassDescriptor(
 
     private val functionTypeForSamInterface = c.storageManager.createNullableLazyValue {
         c.components.samConversionResolver.resolveFunctionTypeIfSamInterface(this) { method ->
-            unsubstitutedMemberScope.resolveMethodToFunctionDescriptor(method, false)
+            unsubstitutedMemberScope.resolveMethodToFunctionDescriptor(method)
         }
     }
 
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt
index 1086773f901..0606ebc5e13 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt
@@ -81,7 +81,8 @@ public abstract class LazyJavaScope(
         val result = LinkedHashSet<SimpleFunctionDescriptor>()
 
         for (method in memberIndex().findMethodsByName(name)) {
-            val descriptor = resolveMethodToFunctionDescriptor(method, true)
+            val descriptor = resolveMethodToFunctionDescriptor(method)
+            c.components.javaResolverCache.recordMethod(method, descriptor)
             result.add(descriptor)
             if (method.isStatic) {
                 result.addIfNotNull(c.components.samConversionResolver.resolveSamAdapter(descriptor))
@@ -104,7 +105,7 @@ public abstract class LazyJavaScope(
             returnType: JetType,
             valueParameters: ResolvedValueParameters): MethodSignatureData
 
-    fun resolveMethodToFunctionDescriptor(method: JavaMethod, record: Boolean = true): JavaMethodDescriptor {
+    fun resolveMethodToFunctionDescriptor(method: JavaMethod): JavaMethodDescriptor {
         val annotations = c.resolveAnnotations(method)
         val functionDescriptorImpl = JavaMethodDescriptor.createJavaMethod(
                 containingDeclaration, annotations, method.getName(), c.components.sourceElementFactory.source(method)
@@ -133,10 +134,6 @@ public abstract class LazyJavaScope(
 
         functionDescriptorImpl.setParameterNamesStatus(effectiveSignature.hasStableParameterNames(), valueParameters.hasSynthesizedNames)
 
-        if (record) {
-            c.components.javaResolverCache.recordMethod(method, functionDescriptorImpl)
-        }
-
         if (signatureErrors.isNotEmpty()) {
             c.components.externalSignatureResolver.reportSignatureErrors(functionDescriptorImpl, signatureErrors)
         }