diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
index 9661f826abd3..b4bd9f540bd1 100644
--- a/.github/workflows/clippy.yml
+++ b/.github/workflows/clippy.yml
@@ -37,13 +37,17 @@ jobs:
         toolchain: nightly
         target: x86_64-unknown-linux-gnu
         profile: minimal
+    - name: Checkout
+      uses: actions/checkout@v2.0.0
+    - name: Run cargo update
+      run: cargo update
     - name: Cache cargo dir
       uses: actions/cache@v1
       with:
         path: ~/.cargo
-        key: ${{ runner.os }}-x86_64-unknown-linux-gnu
-    - name: Checkout
-      uses: actions/checkout@v2.0.0
+        key: ${{ runner.os }}-x86_64-unknown-linux-gnu-${{ hashFiles('Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-x86_64-unknown-linux-gnu
     - name: Master Toolchain Setup
       run: bash setup-toolchain.sh
 
diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml
index e5c570828f9a..3603ad76a692 100644
--- a/.github/workflows/clippy_bors.yml
+++ b/.github/workflows/clippy_bors.yml
@@ -85,13 +85,17 @@ jobs:
         toolchain: nightly
         target: ${{ matrix.host }}
         profile: minimal
+    - name: Checkout
+      uses: actions/checkout@v2.0.0
+    - name: Run cargo update
+      run: cargo update
     - name: Cache cargo dir
       uses: actions/cache@v1
       with:
         path: ~/.cargo
-        key: ${{ runner.os }}-${{ matrix.host }}
-    - name: Checkout
-      uses: actions/checkout@v2.0.0
+        key: ${{ runner.os }}-${{ matrix.host }}-${{ hashFiles('Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-${{ matrix.host }}
     - name: Master Toolchain Setup
       run: bash setup-toolchain.sh
       env:
@@ -163,13 +167,17 @@ jobs:
         toolchain: nightly
         target: x86_64-unknown-linux-gnu
         profile: minimal
+    - name: Checkout
+      uses: actions/checkout@v2.0.0
+    - name: Run cargo update
+      run: cargo update
     - name: Cache cargo dir
       uses: actions/cache@v1
       with:
         path: ~/.cargo
-        key: ${{ runner.os }}-x86_64-unknown-linux-gnu
-    - name: Checkout
-      uses: actions/checkout@v2.0.0
+        key: ${{ runner.os }}-x86_64-unknown-linux-gnu-${{ hashFiles('Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-x86_64-unknown-linux-gnu
     - name: Master Toolchain Setup
       run: bash setup-toolchain.sh
 
@@ -226,13 +234,17 @@ jobs:
         toolchain: nightly
         target: x86_64-unknown-linux-gnu
         profile: minimal
+    - name: Checkout
+      uses: actions/checkout@v2.0.0
+    - name: Run cargo update
+      run: cargo update
     - name: Cache cargo dir
       uses: actions/cache@v1
       with:
         path: ~/.cargo
-        key: ${{ runner.os }}-x86_64-unknown-linux-gnu
-    - name: Checkout
-      uses: actions/checkout@v2.0.0
+        key: ${{ runner.os }}-x86_64-unknown-linux-gnu-${{ hashFiles('Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-x86_64-unknown-linux-gnu
     - name: Master Toolchain Setup
       run: bash setup-toolchain.sh