diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json
index 5f8adfc..6f8bfb5 100644
--- a/infra/specs/client.webrtc.json
+++ b/infra/specs/client.webrtc.json
@@ -8034,10 +8034,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8083,10 +8084,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8132,10 +8134,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8180,10 +8183,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8228,10 +8232,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8276,10 +8281,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8324,10 +8330,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8372,10 +8379,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8420,10 +8428,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8468,10 +8477,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8516,10 +8526,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8564,10 +8575,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8612,10 +8624,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8660,10 +8673,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8708,10 +8722,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8756,10 +8771,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8805,10 +8821,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8854,10 +8871,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -8903,10 +8921,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cores": "12",
             "cpu": "x86-64",
             "os": "Mac-12"
@@ -8953,10 +8972,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cores": "12",
             "cpu": "x86-64",
             "os": "Mac-12"
@@ -9003,10 +9023,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cores": "12",
             "cpu": "x86-64",
             "os": "Mac-12"
@@ -9053,10 +9074,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9101,10 +9123,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9149,10 +9172,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9197,10 +9221,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9245,10 +9270,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9293,10 +9319,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9341,10 +9368,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9389,10 +9417,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9437,10 +9466,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9485,10 +9515,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9534,10 +9565,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9583,10 +9615,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9633,10 +9666,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9682,10 +9716,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9731,10 +9766,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9780,10 +9816,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9829,10 +9866,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9878,10 +9916,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -9926,10 +9965,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cores": "12",
             "cpu": "x86-64",
             "os": "Mac-12"
@@ -9976,10 +10016,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cores": "12",
             "cpu": "x86-64",
             "os": "Mac-12"
@@ -10026,10 +10067,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cores": "12",
             "cpu": "x86-64",
             "os": "Mac-12"
@@ -10076,10 +10118,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10124,10 +10167,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10172,10 +10216,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10220,10 +10265,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10268,10 +10314,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10316,10 +10363,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10364,10 +10412,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10412,10 +10461,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10460,10 +10510,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10508,10 +10559,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10556,10 +10608,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10604,10 +10657,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10652,10 +10706,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10701,10 +10756,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10750,10 +10806,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10799,10 +10856,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10847,10 +10905,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10895,10 +10954,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10943,10 +11003,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -10991,10 +11052,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -11039,10 +11101,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
diff --git a/infra/specs/internal.client.webrtc.json b/infra/specs/internal.client.webrtc.json
index 1e3a147..59547fc 100644
--- a/infra/specs/internal.client.webrtc.json
+++ b/infra/specs/internal.client.webrtc.json
@@ -7,7 +7,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -24,7 +24,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -34,7 +34,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -47,7 +47,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -64,7 +64,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -74,7 +74,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -88,7 +88,7 @@
           "--readline-timeout=1200",
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -105,7 +105,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -117,7 +117,7 @@
           "io_timeout": 7200,
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -131,7 +131,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -148,7 +148,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -158,7 +158,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -172,7 +172,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -189,7 +189,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -199,7 +199,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -212,7 +212,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -229,7 +229,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -239,7 +239,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -252,7 +252,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -269,7 +269,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -279,7 +279,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -292,7 +292,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -309,7 +309,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -319,7 +319,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -332,7 +332,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -349,7 +349,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -359,7 +359,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -372,7 +372,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -389,7 +389,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -399,7 +399,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -412,7 +412,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -429,7 +429,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -439,7 +439,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -480,10 +480,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "device_status": "available",
             "id": "mac-254-e504",
             "os": "iOS-15.7.8",
@@ -511,7 +512,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -528,7 +529,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -538,7 +539,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -551,7 +552,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -568,7 +569,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -578,7 +579,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -592,7 +593,7 @@
           "--readline-timeout=1200",
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -609,7 +610,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -621,7 +622,7 @@
           "io_timeout": 7200,
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -635,7 +636,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -652,7 +653,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -662,7 +663,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -676,7 +677,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -693,7 +694,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -703,7 +704,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -716,7 +717,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -733,7 +734,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -743,7 +744,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -756,7 +757,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -773,7 +774,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -783,7 +784,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -796,7 +797,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -813,7 +814,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -823,7 +824,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -836,7 +837,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -853,7 +854,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -863,7 +864,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -876,7 +877,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -893,7 +894,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -903,7 +904,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
@@ -916,7 +917,7 @@
         "args": [
           "--xctest",
           "--xcode-build-version",
-          "15a240d",
+          "15a507",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -933,7 +934,7 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
@@ -943,7 +944,7 @@
           },
           "named_caches": [
             {
-              "name": "xcode_ios_15a240d",
+              "name": "xcode_ios_15a507",
               "path": "Xcode.app"
             }
           ],
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index cbf9b24..e436846 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -176,7 +176,7 @@
         'location':
         '.',
         'revision':
-        'git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb'
+        'git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce'
       }]
     }
   },
@@ -309,6 +309,9 @@
   'xcode_13_main': {
     'args': ['--xcode-build-version', '13c100'],
     'swarming': {
+      'dimensions': {
+        'caches': 'xcode_ios_13c100'
+      },
       'named_caches': [{
         'name': 'xcode_ios_13c100',
         'path': 'Xcode.app'
@@ -318,6 +321,9 @@
   'xcode_14_main': {
     'args': ['--xcode-build-version', '14c18'],
     'swarming': {
+      'dimensions': {
+        'caches': 'xcode_ios_14c18'
+      },
       'named_caches': [{
         'name': 'xcode_ios_14c18',
         'path': 'Xcode.app'
@@ -325,10 +331,10 @@
     }
   },
   'xcode_15_main': {
-    'args': ['--xcode-build-version', '15a240d'],
+    'args': ['--xcode-build-version', '15a507'],
     'swarming': {
       'named_caches': [{
-        'name': 'xcode_ios_15a240d',
+        'name': 'xcode_ios_15a507',
         'path': 'Xcode.app'
       }]
     }
diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl
index f8fa66b..443a445 100644
--- a/infra/specs/mixins_webrtc.pyl
+++ b/infra/specs/mixins_webrtc.pyl
@@ -224,6 +224,9 @@
   'xcode_13_main': {
     'args': ['--xcode-build-version', '13c100'],
     'swarming': {
+      'dimensions': {
+        'caches': 'xcode_ios_13c100',
+      },
       'named_caches': [{
         'name': 'xcode_ios_13c100',
         'path': 'Xcode.app'
@@ -233,6 +236,9 @@
   'xcode_14_main': {
     'args': ['--xcode-build-version', '14c18'],
     'swarming': {
+      'dimensions': {
+        'caches': 'xcode_ios_14c18',
+      },
       'named_caches': [{
         'name': 'xcode_ios_14c18',
         'path': 'Xcode.app'
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index 61f4221..61e47fd 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -2242,10 +2242,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -2291,10 +2292,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -2340,10 +2342,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -2388,10 +2391,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -2436,10 +2440,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -2484,10 +2489,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -2532,10 +2538,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -2580,10 +2587,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -2628,10 +2636,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -2676,10 +2685,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -2724,10 +2734,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -2772,10 +2783,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -2820,10 +2832,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -2868,10 +2881,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -2916,10 +2930,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -2964,10 +2979,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3013,10 +3029,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3062,10 +3079,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3111,10 +3129,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cores": "12",
             "cpu": "x86-64",
             "os": "Mac-12"
@@ -3161,10 +3180,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cores": "12",
             "cpu": "x86-64",
             "os": "Mac-12"
@@ -3211,10 +3231,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cores": "12",
             "cpu": "x86-64",
             "os": "Mac-12"
@@ -3261,10 +3282,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3309,10 +3331,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3357,10 +3380,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3405,10 +3429,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3453,10 +3478,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3501,10 +3527,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3549,10 +3576,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3597,10 +3625,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3645,10 +3674,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3693,10 +3723,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3742,10 +3773,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3791,10 +3823,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3841,10 +3874,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3890,10 +3924,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3939,10 +3974,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -3988,10 +4024,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -4037,10 +4074,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -4086,10 +4124,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -4134,10 +4173,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cores": "12",
             "cpu": "x86-64",
             "os": "Mac-12"
@@ -4184,10 +4224,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cores": "12",
             "cpu": "x86-64",
             "os": "Mac-12"
@@ -4234,10 +4275,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cores": "12",
             "cpu": "x86-64",
             "os": "Mac-12"
@@ -4284,10 +4326,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -4332,10 +4375,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -4380,10 +4424,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -4428,10 +4473,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -4476,10 +4522,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -4524,10 +4571,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -4572,10 +4620,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -4620,10 +4669,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -4668,10 +4718,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -4716,10 +4767,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -4764,10 +4816,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -4812,10 +4865,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -4860,10 +4914,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -4909,10 +4964,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -4958,10 +5014,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -5007,10 +5064,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -5055,10 +5113,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -5103,10 +5162,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -5151,10 +5211,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_13c100",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -5199,10 +5260,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
@@ -5247,10 +5309,11 @@
             {
               "cipd_package": "infra/tools/mac_toolchain/${platform}",
               "location": ".",
-              "revision": "git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb"
+              "revision": "git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce"
             }
           ],
           "dimensions": {
+            "caches": "xcode_ios_14c18",
             "cpu": "x86-64",
             "os": "Mac-12"
           },
diff --git a/infra/specs/variants.pyl b/infra/specs/variants.pyl
index cf050c6..e764f69 100644
--- a/infra/specs/variants.pyl
+++ b/infra/specs/variants.pyl
@@ -15,10 +15,7 @@
       '14.5',
     ],
     'identifier': 'iPhone X 14.5',
-    'mixins': [
-      'xcode_13_main',
-      'ios_runtime_cache_14_5',
-    ],
+    'mixins': ['xcode_13_main', 'ios_runtime_cache_14_5'],
   },
   'SIM_IPHONE_X_15_5': {
     'args': [
@@ -28,10 +25,7 @@
       '15.5',
     ],
     'identifier': 'iPhone X 15.5',
-    'mixins': [
-      'xcode_14_main',
-      'ios_runtime_cache_15_5',
-    ],
+    'mixins': ['xcode_14_main', 'ios_runtime_cache_15_5'],
   },
   'SIM_IPHONE_X_16_2': {
     'args': [
@@ -41,9 +35,6 @@
       '16.2',
     ],
     'identifier': 'iPhone X 16.2',
-    'mixins': [
-      'xcode_14_main',
-      'ios_runtime_cache_16_2',
-    ],
+    'mixins': ['xcode_14_main', 'ios_runtime_cache_16_2'],
   },
 }