From 24f95c5256e582b152f20439cdad840e4511d28e Mon Sep 17 00:00:00 2001
From: Mykola Mokhnach <mokhnach@gmail.com>
Date: Mon, 11 Aug 2025 19:38:26 +0200
Subject: [PATCH] chore: Cache application instances for their PIDs

---
 .../Utilities/FBXCAXClientProxy.h             |  2 +-
 .../Utilities/FBXCAXClientProxy.m             | 31 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/WebDriverAgentLib/Utilities/FBXCAXClientProxy.h b/WebDriverAgentLib/Utilities/FBXCAXClientProxy.h
index 45a8bcb34..f14650a6d 100644
--- a/WebDriverAgentLib/Utilities/FBXCAXClientProxy.h
+++ b/WebDriverAgentLib/Utilities/FBXCAXClientProxy.h
@@ -43,7 +43,7 @@ NS_ASSUME_NONNULL_BEGIN
                                      attributes:(NSArray *)attributes
                                           error:(NSError**)error;
 
-- (XCUIApplication *)monitoredApplicationWithProcessIdentifier:(int)pid;
+- (nullable XCUIApplication *)monitoredApplicationWithProcessIdentifier:(int)pid;
 
 @end
 
diff --git a/WebDriverAgentLib/Utilities/FBXCAXClientProxy.m b/WebDriverAgentLib/Utilities/FBXCAXClientProxy.m
index 4c7c9cf27..c28232fcd 100644
--- a/WebDriverAgentLib/Utilities/FBXCAXClientProxy.m
+++ b/WebDriverAgentLib/Utilities/FBXCAXClientProxy.m
@@ -14,9 +14,16 @@
 #import "FBMacros.h"
 #import "XCAXClient_iOS+FBSnapshotReqParams.h"
 #import "XCUIDevice.h"
+#import "XCUIApplication.h"
 
 static id FBAXClient = nil;
 
+@interface FBXCAXClientProxy ()
+
+@property (nonatomic) NSMutableDictionary<NSNumber *, XCUIApplication *> *appsCache;
+
+@end
+
 @implementation FBXCAXClientProxy
 
 + (instancetype)sharedClient
@@ -25,6 +32,7 @@ + (instancetype)sharedClient
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
     instance = [[self alloc] init];
+    instance.appsCache = [NSMutableDictionary dictionary];
     FBAXClient = [XCUIDevice.sharedDevice accessibilityInterface];
   });
   return instance;
@@ -85,7 +93,28 @@ - (NSDictionary *)attributesForElement:(id<FBXCAccessibilityElement>)element
 
 - (XCUIApplication *)monitoredApplicationWithProcessIdentifier:(int)pid
 {
-  return [[FBAXClient applicationProcessTracker] monitoredApplicationWithProcessIdentifier:pid];
+  NSMutableSet *terminatedAppIds = [NSMutableSet set];
+  for (NSNumber *appPid in self.appsCache) {
+    if (![self.appsCache[appPid] running]) {
+      [terminatedAppIds addObject:appPid];
+    }
+  }
+  for (NSNumber *appPid in terminatedAppIds) {
+    [self.appsCache removeObjectForKey:appPid];
+  }
+
+  XCUIApplication *result = [self.appsCache objectForKey:@(pid)];
+  if (nil != result) {
+    return result;
+  }
+
+  XCUIApplication *app = [[FBAXClient applicationProcessTracker]
+                          monitoredApplicationWithProcessIdentifier:pid];
+  if (nil == app) {
+    return nil;
+  }
+  [self.appsCache setObject:app forKey:@(pid)];
+  return app;
 }
 
 @end