diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 547026341..ac4e2610a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -84,10 +84,15 @@ on:
 
   # Rebuild 'main' every week. This will account for changes to dependencies
   # and to Rust, either of which can trigger new failures. Rust releases are
-  # every 6 weeks, on a Thursday; this event runs every Friday.
+  # every 6 weeks, on a Thursday; this event runs every Friday. We use this
+  # moment to update CI caches.
   schedule:
     - cron: '0 10 * * FRI'
 
+  # Allow manual execution of CI, primarily for debugging. We consider these
+  # rare and also update CI caches when they occur.
+  workflow_dispatch:
+
 defaults:
   run:
     shell: bash
@@ -300,7 +305,7 @@ jobs:
 
     # Restore a cached `target/`.
     - name: Restore from cache
-      if: github.event_name != 'schedule'
+      if: github.event_name != 'schedule' && github.event_name != 'workflow_dispatch'
       id: cache-restore
       uses: actions/cache/restore@v6
       with:
@@ -310,27 +315,14 @@ jobs:
         # Cache by OS. Use a recently cached version of Rust nightly.
         key: ${{ runner.os }}-${{ runner.arch }}-nightly-clippy-
 
-    # Determine the Rust version provided by the cache.
-    #
-    # If we didn't restore from cache, use the latest nightly.
-    - name: Determine the cached Rust version
-      id: determine-rust-version
-      run: |
-        if [[ -f target/rust-version ]]; then
-          echo "rust-version=$(cat target/rust-version)" >> "$GITHUB_OUTPUT"
-        else
-          echo "rust-version=nightly" >> "$GITHUB_OUTPUT"
-        fi
-
     # Set up the Rust toolchain.
     - name: Set up Rust nightly
-      id: setup-rust
-      uses: actions-rust-lang/setup-rust-toolchain@v1
-      with:
-        toolchain: ${{ steps.determine-rust-version.outputs.rust-version }}
-        components: clippy
-        cache: false
-        matcher: false
+      run: |
+        # Determine the version to install. Fall back to `nightly`.
+        [[ -f target/rust-version ]] && version=$(cat target/rust-version)
+        version=${version:-nightly}
+        rustup toolchain install --component clippy $version 
+        rustup default $version
 
     # Enable a problem matcher to get inline annotations.
     - name: Enable annotations
@@ -342,14 +334,25 @@ jobs:
 
     # Note the Rust version in the cache.
     - name: Note Rust version for the cache
-      if: github.event_name == 'schedule'
+      if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
       run: |
-        rustup toolchain list --quiet | grep nightly- | tee target/rust-version
+        # NOTE: `rustc --version --verbose` also prints a `commit-date`, which
+        # is easier to parse, but it is unclear whether it perfectly matches
+        # the date used for the nightly version by rustup. The date presented
+        # in the first line seems more likely to be the right field.
+        #
+        # Sample input:
+        # > $ rustc --version
+        # > rustc 1.98.0-nightly (df6ee909e 2026-06-28)
+        rustc --version \
+          | grep --extended-regexp --only-matching '[0-9]{4}-[0-9]{2}-[0-9]{2}' \
+          | sed 's/.*/nightly-&/' \
+          | tee target/rust-version
 
     # Save to the cache every week.
     - name: Save to the cache
       uses: actions/cache/save@v6
-      if: github.event_name == 'schedule'
+      if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
       with:
         path: |
           ~/.cargo
@@ -420,7 +423,7 @@ jobs:
 
     # Save to the cache.
     - name: Save to the cache
-      if: github.event_name == 'schedule'
+      if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
       uses: actions/cache/save@v6
       with:
         path: |