diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
index b8b28132200..cd12372aa54 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
@@ -15195,6 +15195,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
                     runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/capturingFromArgumentOfFlexibleType.kt");
                 }
 
+                @Test
+                @TestMetadata("differentCapturedTypes.kt")
+                public void testDifferentCapturedTypes() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/differentCapturedTypes.kt");
+                }
+
                 @Test
                 @TestMetadata("dontCheckNewCapturedTypeSpecificChecksForOldOnes.kt")
                 public void testDontCheckNewCapturedTypeSpecificChecksForOldOnes() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
index a3238759a57..591dc323423 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
@@ -15201,6 +15201,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                     runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/capturingFromArgumentOfFlexibleType.kt");
                 }
 
+                @Test
+                @TestMetadata("differentCapturedTypes.kt")
+                public void testDifferentCapturedTypes() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/differentCapturedTypes.kt");
+                }
+
                 @Test
                 @TestMetadata("dontCheckNewCapturedTypeSpecificChecksForOldOnes.kt")
                 public void testDontCheckNewCapturedTypeSpecificChecksForOldOnes() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
index d47ba025319..4e860627d17 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
@@ -15195,6 +15195,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
                     runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/capturingFromArgumentOfFlexibleType.kt");
                 }
 
+                @Test
+                @TestMetadata("differentCapturedTypes.kt")
+                public void testDifferentCapturedTypes() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/differentCapturedTypes.kt");
+                }
+
                 @Test
                 @TestMetadata("dontCheckNewCapturedTypeSpecificChecksForOldOnes.kt")
                 public void testDontCheckNewCapturedTypeSpecificChecksForOldOnes() throws Exception {
diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt
index 03b9e603493..98668fae190 100644
--- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt
+++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt
@@ -150,8 +150,7 @@ data class ConeCapturedType(
         other as ConeCapturedType
 
         if (lowerType != other.lowerType) return false
-        if (constructor.projection != other.constructor.projection) return false
-        if (constructor.typeParameterMarker != other.constructor.typeParameterMarker) return false
+        if (constructor != other.constructor) return false
         if (captureStatus != other.captureStatus) return false
         if (nullability != other.nullability) return false
 
@@ -161,8 +160,7 @@ data class ConeCapturedType(
     override fun hashCode(): Int {
         var result = 7
         result = 31 * result + (lowerType?.hashCode() ?: 0)
-        result = 31 * result + constructor.projection.hashCode()
-        result = 31 * result + constructor.typeParameterMarker.hashCode()
+        result = 31 * result + constructor.hashCode()
         result = 31 * result + captureStatus.hashCode()
         result = 31 * result + nullability.hashCode()
         return result
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/approximateContravariantCapturedTypes.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/approximateContravariantCapturedTypes.fir.kt
index 56481fbde2f..64f52361d33 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/approximateContravariantCapturedTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/approximateContravariantCapturedTypes.fir.kt
@@ -26,15 +26,15 @@ fun Float.bar() {}
 fun <K> id(x: K) = x
 
 fun test1() {
-    val fooSetRef = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.reflect.KFunction2<Foo<*>, CapturedType(*), CapturedType(*)>")!>Foo<*>::setX<!>
+    val fooSetRef = <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Unresolved reference: setX")!>Foo<*>::<!UNRESOLVED_REFERENCE!>setX<!><!>
 
-    val fooSetRef2 = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.reflect.KFunction2<Foo<*>, kotlin.Nothing, kotlin.Number>")!>id(
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.reflect.KFunction2<Foo<*>, CapturedType(*), CapturedType(*)>")!>Foo<*>::setX<!>
+    val fooSetRef2 = <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Cannot infer argument for type parameter K")!><!INAPPLICABLE_CANDIDATE!>id<!>(
+        <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Unresolved reference: setX")!>Foo<*>::<!UNRESOLVED_REFERENCE!>setX<!><!>
     )<!>
     val foo = Foo<Float>(1f)
 
-    fooSetRef.invoke(foo, <!ARGUMENT_TYPE_MISMATCH!>1<!>)
-    fooSetRef2.invoke(foo, <!ARGUMENT_TYPE_MISMATCH!>1<!>)
+    fooSetRef.<!UNRESOLVED_REFERENCE!>invoke<!>(foo, 1)
+    fooSetRef2.<!UNRESOLVED_REFERENCE!>invoke<!>(foo, 1)
 
     foo.x.bar()
 }
@@ -53,14 +53,14 @@ fun test2() {
 }
 
 fun test3() {
-    val fooSetRef = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.reflect.KFunction2<Foo2<*>, CapturedType(*), CapturedType(*)>")!>Foo2<*>::setX<!>
-    val fooSetRef2 = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.reflect.KFunction2<Foo2<*>, kotlin.Nothing, kotlin.Any?>")!>id(
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.reflect.KFunction2<Foo2<*>, CapturedType(*), CapturedType(*)>")!>Foo2<*>::setX<!>
+    val fooSetRef = <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Unresolved reference: setX")!>Foo2<*>::<!UNRESOLVED_REFERENCE!>setX<!><!>
+    val fooSetRef2 = <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Cannot infer argument for type parameter K")!><!INAPPLICABLE_CANDIDATE!>id<!>(
+        <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Unresolved reference: setX")!>Foo2<*>::<!UNRESOLVED_REFERENCE!>setX<!><!>
     )<!>
     val foo = Foo2<Int>(1)
 
-    fooSetRef.invoke(foo, <!ARGUMENT_TYPE_MISMATCH!>""<!>)
-    fooSetRef2.invoke(foo, <!ARGUMENT_TYPE_MISMATCH!>""<!>)
+    fooSetRef.<!UNRESOLVED_REFERENCE!>invoke<!>(foo, "")
+    fooSetRef2.<!UNRESOLVED_REFERENCE!>invoke<!>(foo, "")
 
     foo.x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>bar<!>()
 }
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/differentCapturedTypes.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/differentCapturedTypes.kt
new file mode 100644
index 00000000000..65e0cbea0a3
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/differentCapturedTypes.kt
@@ -0,0 +1,18 @@
+// FIR_IDENTICAL
+// SKIP_TXT
+
+fun <X> select(vararg x: X): X = x[0]
+fun <E> myE(): Out<E>? =  null
+
+interface Out<out T>
+
+fun foo(w: Out<*>) {
+    // To have inference working we need both instances of `w` expressions captured to a different captured types instances
+    // that return `false` when comparing them via `equals`.
+    //
+    // Otherwise, due to some complicated inferences implementation details that are not really relevant,
+    // we've got NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER here.
+    //
+    // Anyway, this code should be definitely green and this test ensures it.
+    select(w, myE() ?: w)
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt25432.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/inference/kt25432.fir.kt
index fad47bd5e27..15e4c2c716c 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt25432.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt25432.fir.kt
@@ -4,7 +4,7 @@ class Data<T>(val s: T)
 
 fun test(d: Data<out Any>) {
     if (d.s is String) {
-        d.s.length
+        d.s.<!UNRESOLVED_REFERENCE!>length<!>
     }
 }
 
diff --git a/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartCastOnValueBoundToSubjectVariable.fir.kt b/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartCastOnValueBoundToSubjectVariable.fir.kt
index f74066d400b..d98e52b8cf0 100644
--- a/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartCastOnValueBoundToSubjectVariable.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartCastOnValueBoundToSubjectVariable.fir.kt
@@ -43,6 +43,6 @@ fun test5(x: Inv<out Any?>) {
 
 fun test6(x: Inv<out String?>) {
     when (val y = x.data) {
-        is String -> x.data.length // should be ok
+        is String -> x.data<!UNSAFE_CALL!>.<!>length // should be ok
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.fir.kt
index 6b45cf7601d..9c3f8d9fcd3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.fir.kt
@@ -1,6 +1,6 @@
 
 fun test(mc: MutableCollection<out CharSequence>) {
-    mc.addAll(mc)
+    mc.addAll(<!ARGUMENT_TYPE_MISMATCH!>mc<!>)
 
     mc.addAll(<!ARGUMENT_TYPE_MISMATCH!>arrayListOf<CharSequence>()<!>)
     mc.addAll(arrayListOf())
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index a02a365c895..374d95de6ba 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -15201,6 +15201,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                     runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/capturingFromArgumentOfFlexibleType.kt");
                 }
 
+                @Test
+                @TestMetadata("differentCapturedTypes.kt")
+                public void testDifferentCapturedTypes() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/differentCapturedTypes.kt");
+                }
+
                 @Test
                 @TestMetadata("dontCheckNewCapturedTypeSpecificChecksForOldOnes.kt")
                 public void testDontCheckNewCapturedTypeSpecificChecksForOldOnes() throws Exception {