diff --git a/archreview/plans/R2-09-driver-fleet-batch-plan.md.tasks.json b/archreview/plans/R2-09-driver-fleet-batch-plan.md.tasks.json
index 6790b898..854a47bf 100644
--- a/archreview/plans/R2-09-driver-fleet-batch-plan.md.tasks.json
+++ b/archreview/plans/R2-09-driver-fleet-batch-plan.md.tasks.json
@@ -56,7 +56,7 @@
     {
       "id": "B2.5",
       "subject": "B2: convert the four FOCAS caches to ConcurrentDictionary; FOCAS suite green; merge PR 2",
-      "status": "pending",
+      "status": "completed",
       "blockedBy": [
         "B2.3",
         "B2.4"
diff --git a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasDriver.cs b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasDriver.cs
index d2ba8789..e964ca94 100644
--- a/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasDriver.cs
+++ b/src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasDriver.cs
@@ -1195,17 +1195,17 @@ public sealed class FocasDriver : IDriver, IReadable, IWritable, ITagDiscovery,
         ///     scale applied at <see cref="PublishAxisSnapshot"/>; integer fields
         ///     (feed rate, spindle speed) widen to double on store.
         /// </summary>
-        public Dictionary<string, double> LastFixedSnapshots { get; } = new(StringComparer.OrdinalIgnoreCase);
+        public ConcurrentDictionary<string, double> LastFixedSnapshots { get; } = new(StringComparer.OrdinalIgnoreCase);
         /// <summary>Gets or sets the last program information snapshot.</summary>
         public FocasProgramInfo? LastProgramInfo { get; set; }
         /// <summary>Gets or sets the cached first-axis dynamic snapshot — feeds Program/Number, /MainNumber, /Sequence.</summary>
         public FocasDynamicSnapshot? LastProgramAxisRef { get; set; }
         /// <summary>Gets the last timer values by timer kind.</summary>
-        public Dictionary<FocasTimerKind, FocasTimer> LastTimers { get; } = [];
+        public ConcurrentDictionary<FocasTimerKind, FocasTimer> LastTimers { get; } = new();
         /// <summary>Gets the last servo load percentages by servo name.</summary>
-        public Dictionary<string, double> LastServoLoads { get; } = new(StringComparer.OrdinalIgnoreCase);
+        public ConcurrentDictionary<string, double> LastServoLoads { get; } = new(StringComparer.OrdinalIgnoreCase);
         /// <summary>Gets the last spindle load percentages by spindle index.</summary>
-        public Dictionary<int, int> LastSpindleLoads { get; } = [];
+        public ConcurrentDictionary<int, int> LastSpindleLoads { get; } = new();
         /// <summary>
         ///     Gets or sets the per-axis position decimal-place figures fetched once at init via
         ///     <c>cnc_getfigure</c> (parallel to the axis-name list; index = axis). An auto figure