From 4f5ead25fc93661fc7d047ab8f574500cd4a9ffa Mon Sep 17 00:00:00 2001
From: Michael Pomogajko <m.pomogajko@gmail.com>
Date: Thu, 16 Apr 2026 15:12:15 +0200
Subject: [PATCH] fix(firestore): cache Android instances by firestoreKey

---
 .../firebase/firestore/UniversalFirebaseFirestoreCommon.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/firestore/android/src/main/java/io/invertase/firebase/firestore/UniversalFirebaseFirestoreCommon.java b/packages/firestore/android/src/main/java/io/invertase/firebase/firestore/UniversalFirebaseFirestoreCommon.java
index b241b9344c..b435057d19 100644
--- a/packages/firestore/android/src/main/java/io/invertase/firebase/firestore/UniversalFirebaseFirestoreCommon.java
+++ b/packages/firestore/android/src/main/java/io/invertase/firebase/firestore/UniversalFirebaseFirestoreCommon.java
@@ -50,7 +50,7 @@ static FirebaseFirestore getFirestoreForApp(String appName, String databaseId) {
 
     setFirestoreSettings(instance, firestoreKey);
 
-    instanceCache.put(appName, new WeakReference<FirebaseFirestore>(instance));
+    instanceCache.put(firestoreKey, new WeakReference<FirebaseFirestore>(instance));
 
     return instance;
   }