diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 6da406ae7..ae293aa68 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -51,6 +51,7 @@ jobs:
         with:
           shared-key: "libra-framework"
           cache-all-crates: true
+          cache-on-failure: true
 
       # fail fast if types doesn't compile, everything else will fail.
       - name: types
@@ -71,6 +72,7 @@ jobs:
         with:
           shared-key: "libra-framework"
           cache-all-crates: true
+          cache-on-failure: true
 
       - name: wallet
         if: always()
@@ -98,6 +100,7 @@ jobs:
         with:
           shared-key: "libra-framework"
           cache-all-crates: true
+          cache-on-failure: true
 
       # Check test suite meta tests
       - name: smoke-tests # NOTE: needs working DIEM_FORGE_NODE_BIN_PATH
@@ -118,6 +121,7 @@ jobs:
         with:
           shared-key: "libra-framework"
           cache-all-crates: true
+          cache-on-failure: true
 
       - uses: actions/download-artifact@v4.1.2
         with:
@@ -144,6 +148,7 @@ jobs:
         with:
           shared-key: "libra-framework"
           cache-all-crates: true
+          cache-on-failure: true
 
       - uses: actions/download-artifact@v4.1.2
         with:
@@ -169,6 +174,7 @@ jobs:
         with:
           shared-key: "libra-framework"
           cache-all-crates: true
+          cache-on-failure: true
 
       - uses: actions/download-artifact@v4.1.2
         with:
@@ -208,6 +214,7 @@ jobs:
         with:
           shared-key: "libra-framework"
           cache-all-crates: true
+          cache-on-failure: true
 
       - uses: actions/download-artifact@v4.1.2
         with:
@@ -260,6 +267,12 @@ jobs:
       - name: setup env
         uses: ./.github/actions/build_env
 
+      - uses: Swatinem/rust-cache@v2.7.3
+        with:
+          shared-key: "libra-framework"
+          cache-all-crates: true
+          cache-on-failure: true
+
       - uses: actions/download-artifact@v4.1.2
         with:
           name: framework-build
@@ -282,6 +295,7 @@ jobs:
         with:
           shared-key: "libra-framework"
           cache-all-crates: true
+          cache-on-failure: true
 
       - name: storage
         working-directory: ./tools/storage
@@ -301,6 +315,8 @@ jobs:
         with:
           shared-key: "libra-framework"
           cache-all-crates: true
+          cache-on-failure: true
+
       - name: twin
         working-directory: ./testsuites/twin
         run: cargo test --no-fail-fast
diff --git a/.github/workflows/cleanliness.yaml b/.github/workflows/cleanliness.yaml
index a355d226e..e50bf1399 100644
--- a/.github/workflows/cleanliness.yaml
+++ b/.github/workflows/cleanliness.yaml
@@ -29,6 +29,7 @@ jobs:
         with:
           shared-key: "libra-framework"
           cache-all-crates: true
+          cache-on-failure: true
 
       - name: format
         uses: actions-rs/cargo@v1