diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml
index 304208d1086..c99db12b1bc 100644
--- a/.github/actions/setup/action.yaml
+++ b/.github/actions/setup/action.yaml
@@ -35,8 +35,8 @@ runs:
           target/
         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}${{ inputs.cache-key }}
         restore-keys: |
-          ${{ runner.os }}-cargo
           ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          ${{ runner.os }}-cargo
 
     - name: Setup rust related environment variables
       shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f05a5e24096..5f6116db66c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,7 +55,7 @@ jobs:
       - name: Setup Rust toolchain
         uses: ./.github/actions/setup
         with:
-          cache-key: "-services-all"
+          cache-key: "-check"
 
       - name: Check license headers
         uses: korandoru/hawkeye@v1.5.4
@@ -117,7 +117,7 @@ jobs:
       - name: Setup Rust toolchain
         uses: ./.github/actions/setup
         with:
-          cache-key: "-services-all"
+          cache-key: "-build-all-features"
       - name: Build
         run: cargo build --all-features