diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0f0a583..5ebb02c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,7 +82,7 @@ jobs:
         name: Compute Configuration
         run: |
           if ${{ github.event_name == 'pull_request' }}; then
-            if ${{ contains(github.event.pull_request.labels.*.name, 'A-index') }}; then
+            if ${{ contains(github.event.pull_request.labels.*.name, 'A-index') || contains(github.event.pull_request.labels.*.name, 'A-cache') }}; then
               echo testbed=true >> "$GITHUB_OUTPUT"
               echo 'package-pattern=.*' >> "$GITHUB_OUTPUT"
             elif ${{ contains(github.event.pull_request.labels.*.name, 'A-testbed') }}; then
@@ -90,7 +90,7 @@ jobs:
               echo 'package-pattern=^leanprover' >> "$GITHUB_OUTPUT"
             fi
             echo search-packages=${{ contains(github.event.pull_request.labels.*.name, 'A-search') }} >> "$GITHUB_OUTPUT"
-            echo 'testbed-toolchain=${{ contains(github.event.pull_request.labels.*.name, 'A-testbed') && 'package,latest' || 'none' }}' >> "$GITHUB_OUTPUT"
+            echo 'testbed-toolchain=${{ (contains(github.event.pull_request.labels.*.name, 'A-testbed') || contains(github.event.pull_request.labels.*.name, 'A-cache')) && 'package,latest' || 'none' }}' >> "$GITHUB_OUTPUT"
             echo cache-builds=${{ contains(github.event.pull_request.labels.*.name, 'A-cache') }} >> "$GITHUB_OUTPUT"
           else
             if ${{ github.event_name == 'push' && github.ref_name == 'master' && contains(github.event.head_commit.message, 'UPDATE-INDEX') }}; then
diff --git a/scripts/testbed-create.py b/scripts/testbed-create.py
index ec95f31..9aa62b7 100755
--- a/scripts/testbed-create.py
+++ b/scripts/testbed-create.py
@@ -113,11 +113,7 @@ def create_layers(entries: Iterable[TestbedEntry]) -> Iterable[TestbedLayer]:
       if git_url is None:
         logging.error(f"{pkg['fullName']}: Package lacks a Git source")
       else:
-        cache_builds = (
-          args.cache and
-          pkg['owner'] in ['leanprover', 'leanprover-community'] and
-          pkg['fullName'] != 'leanprover-community/mathlib'
-        )
+        cache_builds = args.cache and pkg['fullName'] != 'leanprover-community/mathlib'
         entry = create_entry(
           pkg['fullName'], git_url,
           toolchains, args.version_tags, cache_builds,