public async Task SendMessageStreamingAsync(string endPoint, List<Part> parts, Func<SseItem<A2AEvent>, Task>? onStreamingEventReceived, CancellationToken cancellationToken = default)
     {
-        A2ACardResolver cardResolver = new(new Uri(endPoint));
-        AgentCard agentCard = await cardResolver.GetAgentCardAsync();
-        A2AClient client = new A2AClient(new Uri(agentCard.Url));
+        var client = await GetOrCreateClient(endPoint);
 
         AgentMessage userMessage = new()
 ...
     public async Task ListenForTaskEventAsync(string endPoint, string taskId, Func<SseItem<A2AEvent>, ValueTask>? onTaskEventReceived = null, CancellationToken cancellationToken = default)
     {
 ...
-        A2ACardResolver cardResolver = new(new Uri(endPoint));
-        AgentCard agentCard = await cardResolver.GetAgentCardAsync();
-        A2AClient client = new A2AClient(new Uri(agentCard.Url));
+        var client = await GetOrCreateClient(endPoint);
 
         await foreach (SseItem<A2AEvent> sseItem in client.SubscribeToTaskAsync(taskId))
 ...
     public async Task SetPushNotifications(string endPoint, PushNotificationConfig config, CancellationToken cancellationToken = default)
     {
-        A2ACardResolver cardResolver = new(new Uri(endPoint));
-        AgentCard agentCard = await cardResolver.GetAgentCardAsync();
-        A2AClient client = new A2AClient(new Uri(agentCard.Url));
+        var client = await GetOrCreateClient(endPoint);
         await client.SetPushNotificationAsync(new TaskPushNotificationConfig()
 ...
     public async Task<AgentTask> CancelTaskAsync(string endPoint, string taskId, CancellationToken cancellationToken = default)
     {
-        A2ACardResolver cardResolver = new(new Uri(endPoint));
-        AgentCard agentCard = await cardResolver.GetAgentCardAsync();
-        A2AClient client = new A2AClient(new Uri(agentCard.Url));
+        var client = await GetOrCreateClient(endPoint);
         return await client.CancelTaskAsync(taskId);
     }
 
     public async Task<AgentTask> GetTaskAsync(string endPoint, string taskId, CancellationToken cancellationToken = default)
     {
-        A2ACardResolver cardResolver = new(new Uri(endPoint));
-        AgentCard agentCard = await cardResolver.GetAgentCardAsync();
-        A2AClient client = new A2AClient(new Uri(agentCard.Url));
+        var client = await GetOrCreateClient(endPoint);
         return await client.GetTaskAsync(taskId);
     }
 
+    private async Task<A2AClient> GetOrCreateClient(string agentEndpoint)
+    {
+        if (!_clientCache.TryGetValue(agentEndpoint, out var client))
+        {
+            A2ACardResolver cardResolver = new(new Uri(agentEndpoint));
+            AgentCard agentCard = await cardResolver.GetAgentCardAsync();
+            HttpClient httpclient = _httpClientFactory.CreateClient();
+            client = new A2AClient(new Uri(agentCard.Url), httpclient);
+            _clientCache[agentEndpoint] = client;
+        }
+        return client;
+    }
+

-private readonly Dictionary<string, A2AClient> _clientCache = new Dictionary<string, A2AClient>();
+private readonly ConcurrentDictionary<string, A2AClient> _clientCache = new ConcurrentDictionary<string, A2AClient>();

-var agentCard = _iA2AService.GetCapabilitiesAsync(remoteConfig.Endpoint).GetAwaiter().GetResult();
+var agentCard = _iA2AService
+    .GetCapabilitiesAsync(remoteConfig.Endpoint)
+    .ConfigureAwait(false)
+    .GetAwaiter()
+    .GetResult();

 catch (HttpRequestException ex)
 {
-    _logger.LogError(ex, $"Network error communicating with A2A agent at {agentEndpoint}");
-    throw new Exception($"Remote agent unavailable: {ex.Message}");
+    _logger.LogError(ex, "Network error communicating with A2A agent at {AgentEndpoint}", agentEndpoint);
+    throw new HttpRequestException($"Remote agent unavailable: {ex.Message}", ex);
 }
 catch (Exception ex)
 {
-    _logger.LogError(ex, $"A2A Protocol error: {ex.Message}");
+    _logger.LogError(ex, "A2A protocol error communicating with {AgentEndpoint}", agentEndpoint);
     throw;
 }