@@ -1,8 +1,18 @@
-name: JDK cache benchmark dispatcher
+name: Focused cache restore
 
 on:
   workflow_dispatch:
     inputs:
+      samples:
+        description: Warm restore samples per version
+        required: true
+        type: choice
+        options:
+          - "2"
+          - "6"
+          - "10"
+          - "20"
+        default: "10"
       cleanup-caches:
         description: Delete benchmark caches after measuring them
         required: true
@@ -13,8 +23,156 @@ permissions:
   actions: write
   contents: read
 
+env:
+  JAVA_VERSION: 17.0.19+10
+  DEPENDENCY_FIXTURE_MIB: "160"
+  WRAPPER_FIXTURE_MIB: "9"
+
+concurrency:
+  group: focused-cache-restore
+  cancel-in-progress: false
+
 jobs:
-  benchmark:
-    uses: actions/setup-java-benchmarks/.github/workflows/jdk-cache.yml@brunoborges-benchmark-jdk-cache
-    with:
-      cleanup-caches: ${{ inputs.cleanup-caches }}
+  v4-seed:
+    name: Seed v4 cache
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Check out benchmark repository
+        uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
+        with:
+          persist-credentials: false
+      - name: Prepare cache identity
+        env:
+          BENCHMARK_ID: focused-v4-${{ github.run_id }}
+        run: |
+          printf '%s\n' "$BENCHMARK_ID" > .focused-cache-key
+          mkdir -p .mvn/wrapper
+          printf 'wrapperVersion=focused\n# benchmark-id=%s\n' "$BENCHMARK_ID" > .mvn/wrapper/maven-wrapper.properties
+      - name: Setup Java v4
+        uses: actions/setup-java@v4.8.0
+        with:
+          distribution: temurin
+          java-version: ${{ env.JAVA_VERSION }}
+          cache: maven
+          cache-dependency-path: .focused-cache-key
+      - name: Create synthetic cache fixtures
+        run: |
+          mkdir -p ~/.m2/repository/focused-benchmark
+          head -c "$((DEPENDENCY_FIXTURE_MIB * 1024 * 1024))" /dev/urandom > ~/.m2/repository/focused-benchmark/dependencies.bin &
+          wait
+
+  main-seed:
+    name: Seed main caches
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Check out benchmark repository
+        uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
+        with:
+          persist-credentials: false
+      - name: Prepare cache identity
+        env:
+          BENCHMARK_ID: focused-main-${{ github.run_id }}
+        run: |
+          printf '%s\n' "$BENCHMARK_ID" > .focused-cache-key
+          mkdir -p .mvn/wrapper
+          printf 'wrapperVersion=focused\n# benchmark-id=%s\n' "$BENCHMARK_ID" > .mvn/wrapper/maven-wrapper.properties
+      - name: Setup Java main
+        uses: actions/setup-java@main
+        with:
+          distribution: temurin
+          java-version: ${{ env.JAVA_VERSION }}
+          cache: maven
+          cache-dependency-path: .focused-cache-key
+      - name: Create synthetic cache fixtures
+        run: |
+          mkdir -p ~/.m2/repository/focused-benchmark
+          mkdir -p ~/.m2/wrapper/dists/focused-benchmark
+          head -c "$((DEPENDENCY_FIXTURE_MIB * 1024 * 1024))" /dev/urandom > ~/.m2/repository/focused-benchmark/dependencies.bin &
+          head -c "$((WRAPPER_FIXTURE_MIB * 1024 * 1024))" /dev/urandom > ~/.m2/wrapper/dists/focused-benchmark/wrapper.bin &
+          wait
+
+  v4-measure:
+    name: v4 / warm / ${{ matrix.sample }}
+    needs: v4-seed
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        sample: ${{ fromJSON(inputs.samples == '20' && '[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]' || inputs.samples == '10' && '[1,2,3,4,5,6,7,8,9,10]' || inputs.samples == '6' && '[1,2,3,4,5,6]' || '[1,2]') }}
+    steps:
+      - name: Check out benchmark repository
+        uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
+        with:
+          persist-credentials: false
+      - name: Prepare cache identity
+        env:
+          BENCHMARK_ID: focused-v4-${{ github.run_id }}
+        run: |
+          printf '%s\n' "$BENCHMARK_ID" > .focused-cache-key
+          mkdir -p .mvn/wrapper
+          printf 'wrapperVersion=focused\n# benchmark-id=%s\n' "$BENCHMARK_ID" > .mvn/wrapper/maven-wrapper.properties
+      - name: Setup Java v4
+        uses: actions/setup-java@v4.8.0
+        with:
+          distribution: temurin
+          java-version: ${{ env.JAVA_VERSION }}
+          cache: maven
+          cache-dependency-path: .focused-cache-key
+      - name: Verify restored fixtures
+        run: |
+          test "$(wc -c < ~/.m2/repository/focused-benchmark/dependencies.bin)" -eq "$((DEPENDENCY_FIXTURE_MIB * 1024 * 1024))"
+
+  main-measure:
+    name: main / warm / ${{ matrix.sample }}
+    needs: main-seed
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        sample: ${{ fromJSON(inputs.samples == '20' && '[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]' || inputs.samples == '10' && '[1,2,3,4,5,6,7,8,9,10]' || inputs.samples == '6' && '[1,2,3,4,5,6]' || '[1,2]') }}
+    steps:
+      - name: Check out benchmark repository
+        uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
+        with:
+          persist-credentials: false
+      - name: Prepare cache identity
+        env:
+          BENCHMARK_ID: focused-main-${{ github.run_id }}
+        run: |
+          printf '%s\n' "$BENCHMARK_ID" > .focused-cache-key
+          mkdir -p .mvn/wrapper
+          printf 'wrapperVersion=focused\n# benchmark-id=%s\n' "$BENCHMARK_ID" > .mvn/wrapper/maven-wrapper.properties
+      - name: Setup Java main
+        uses: actions/setup-java@main
+        with:
+          distribution: temurin
+          java-version: ${{ env.JAVA_VERSION }}
+          cache: maven
+          cache-dependency-path: .focused-cache-key
+      - name: Verify restored fixtures
+        run: |
+          test "$(wc -c < ~/.m2/repository/focused-benchmark/dependencies.bin)" -eq "$((DEPENDENCY_FIXTURE_MIB * 1024 * 1024))"
+          test "$(wc -c < ~/.m2/wrapper/dists/focused-benchmark/wrapper.bin)" -eq "$((WRAPPER_FIXTURE_MIB * 1024 * 1024))"
+
+  report:
+    name: Report
+    needs: [v4-measure, main-measure]
+    if: ${{ always() && !cancelled() }}
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Check out benchmark repository
+        uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
+        with:
+          persist-credentials: false
+      - name: Generate focused report
+        env:
+          GH_TOKEN: ${{ github.token }}
+          SAMPLES: ${{ inputs.samples }}
+          CLEANUP_CACHES: ${{ inputs.cleanup-caches }}
+        run: node scripts/report-focused.mjs
+      - name: Upload benchmark results
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
+        with:
+          name: focused-cache-restore-${{ github.run_id }}
+          path: focused-results/
+          retention-days: 30
@@ -1,12 +1,6 @@
 name: JDK cache benchmark
 
 on:
-  workflow_call:
-    inputs:
-      cleanup-caches:
-        description: Delete benchmark caches after measuring them
-        required: true
-        type: boolean
   workflow_dispatch:
     inputs:
       cleanup-caches:
 
@@ -4,7 +4,7 @@ import {pathToFileURL} from 'node:url';
 import {hashFilesSingle, secondsBetween} from './report.mjs';
 
 const API_VERSION = '2022-11-28';
-const JOB_PATTERN = /^(?:benchmark \/ )?(baseline|candidate) \/ (cold|warm)$/;
+const JOB_PATTERN = /^(baseline|candidate) \/ (cold|warm)$/;
 const JDK_CACHE_PREFIX = 'setup-java-jdk-v1-Linux-x64-';
 
 export function parseJdkCacheJob(name) {
 
@@ -96,9 +96,5 @@ test('parses JDK cache benchmark job names', () => {
     variant: 'candidate',
     phase: 'warm'
   });
-  assert.deepEqual(parseJdkCacheJob('benchmark / candidate / warm'), {
-    variant: 'candidate',
-    phase: 'warm'
-  });
   assert.equal(parseJdkCacheJob('Report'), null);
 });