diff --git a/.github/workflows/iroha2-dev-nightly.yml b/.github/workflows/iroha2-dev-nightly.yml
index bc5e2bb1181..2b420bbaff4 100644
--- a/.github/workflows/iroha2-dev-nightly.yml
+++ b/.github/workflows/iroha2-dev-nightly.yml
@@ -18,7 +18,7 @@ jobs:
           targets: aarch64-apple-darwin,wasm32-unknown-unknown
           # needed to build smart contracts
           components: rust-src
-      - uses: Swatinem/rust-cache@v2
+      - uses: Leafwing-Studios/cargo-cache@v2
       - name: Build iroha executor
         run: cargo run --bin iroha_wasm_builder -- build ./wasm_samples/default_executor --optimize --out-file ${{ env.DOCKER_COMPOSE_PATH }}/executor.wasm
       - name: Upload executor to reuse in other jobs
diff --git a/.github/workflows/iroha2-dev-pr-wasm.yaml b/.github/workflows/iroha2-dev-pr-wasm.yaml
index 0db914f03c2..d8e3d0ab1ce 100644
--- a/.github/workflows/iroha2-dev-pr-wasm.yaml
+++ b/.github/workflows/iroha2-dev-pr-wasm.yaml
@@ -35,7 +35,7 @@ jobs:
           targets: aarch64-apple-darwin,wasm32-unknown-unknown
           # needed to build smart contracts
           components: rust-src
-      - uses: Swatinem/rust-cache@v2
+      - uses: Leafwing-Studios/cargo-cache@v2
       - name: Build iroha executor
         run: cargo run --bin iroha_wasm_builder -- build ./wasm_samples/default_executor --optimize --out-file ${{ env.DOCKER_COMPOSE_PATH }}/executor.wasm
       - name: Upload executor to reuse in other jobs
@@ -61,7 +61,7 @@ jobs:
           targets: aarch64-apple-darwin,wasm32-unknown-unknown
           # needed to build smart contracts
           components: rust-src
-      - uses: Swatinem/rust-cache@v2
+      - uses: Leafwing-Studios/cargo-cache@v2
       - name: Install iroha_wasm_test_runner
         run: cargo install --path tools/wasm_test_runner
       - name: Run smart contract tests on WebAssembly VM
diff --git a/.github/workflows/iroha2-dev-pr.yml b/.github/workflows/iroha2-dev-pr.yml
index 67e0de5f018..9a53faa9333 100644
--- a/.github/workflows/iroha2-dev-pr.yml
+++ b/.github/workflows/iroha2-dev-pr.yml
@@ -32,7 +32,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN }}
-      - uses: Swatinem/rust-cache@v2
+      - uses: Leafwing-Studios/cargo-cache@v2
       - name: Check genesis.json
         if: always()
         run: ./scripts/tests/consistency.sh genesis
@@ -51,7 +51,7 @@ jobs:
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN }}
           components: rustfmt, clippy
-      - uses: Swatinem/rust-cache@v2
+      - uses: Leafwing-Studios/cargo-cache@v2
       - name: Format
         run: cargo fmt --all -- --check
       - name: Lints without features
@@ -80,7 +80,7 @@ jobs:
           targets: aarch64-apple-darwin,wasm32-unknown-unknown
           # needed to build smart contracts
           components: rust-src
-      - uses: Swatinem/rust-cache@v2
+      - uses: Leafwing-Studios/cargo-cache@v2
       - name: Build iroha executor
         run: cargo run --bin iroha_wasm_builder -- build ./wasm_samples/default_executor --optimize --out-file ${{ env.DOCKER_COMPOSE_PATH }}/executor.wasm
       - name: Upload executor to reuse in other jobs
@@ -106,7 +106,7 @@ jobs:
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN }}
           components: llvm-tools-preview
-      - uses: Swatinem/rust-cache@v2
+      - uses: Leafwing-Studios/cargo-cache@v2
       - uses: taiki-e/install-action@nextest
       - uses: taiki-e/install-action@cargo-llvm-cov
       - name: Run unit tests (no default features)
@@ -152,7 +152,9 @@ jobs:
           targets: aarch64-apple-darwin,wasm32-unknown-unknown
           # needed to build smart contracts
           components: rust-src
-      - uses: Swatinem/rust-cache@v2
+      - uses: Leafwing-Studios/cargo-cache@v2
+        with:
+          cache-group: integration
       - uses: taiki-e/install-action@nextest
       - name: Run integration tests, with all features
         run: >
@@ -178,7 +180,9 @@ jobs:
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN }}
           targets: aarch64-apple-darwin,wasm32-unknown-unknown
-      - uses: Swatinem/rust-cache@v2
+      - uses: Leafwing-Studios/cargo-cache@v2
+        with:
+          cache-group: integration
       - uses: taiki-e/install-action@nextest
       - name: Run integration tests, with all features
         run: >
diff --git a/.github/workflows/iroha2-dev.yml b/.github/workflows/iroha2-dev.yml
index e9387efad3b..234eb0cedca 100644
--- a/.github/workflows/iroha2-dev.yml
+++ b/.github/workflows/iroha2-dev.yml
@@ -23,7 +23,7 @@ jobs:
           targets: aarch64-apple-darwin,wasm32-unknown-unknown
           # needed to build smart contracts
           components: rust-src
-      - uses: Swatinem/rust-cache@v2
+      - uses: Leafwing-Studios/cargo-cache@v2
       - name: Build iroha executor
         run: cargo run --bin iroha_wasm_builder -- build ./wasm_samples/default_executor --optimize --out-file ${{ env.DOCKER_COMPOSE_PATH }}/executor.wasm
       - name: Upload executor to reuse in other jobs
@@ -96,7 +96,7 @@ jobs:
       image: hyperledger/iroha2-ci:nightly-2024-04-18
     steps:
       - uses: actions/checkout@v4
-      - uses: Swatinem/rust-cache@v2
+      - uses: Leafwing-Studios/cargo-cache@v2
       - name: Run debug tests and save telemetry
         env:
           TELEMETRY_FILE: ../target/telemetry/debug.json.lz4
diff --git a/.github/workflows/iroha2-pr-ui.yml b/.github/workflows/iroha2-pr-ui.yml
index 761150ea261..efacc383f42 100644
--- a/.github/workflows/iroha2-pr-ui.yml
+++ b/.github/workflows/iroha2-pr-ui.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN }}
-      - uses: Swatinem/rust-cache@v2
+      - uses: Leafwing-Studios/cargo-cache@v2
       - uses: taiki-e/install-action@nextest
       - name: Run UI tests, with ${{ matrix.feature_flag }}
         run: cargo nextest run --no-fail-fast  -E 'test(ui)' --${{ matrix.feature_flag }}
diff --git a/.github/workflows/iroha2-profiling-image.yml b/.github/workflows/iroha2-profiling-image.yml
index d4079105928..1c2c31fd4d9 100644
--- a/.github/workflows/iroha2-profiling-image.yml
+++ b/.github/workflows/iroha2-profiling-image.yml
@@ -44,7 +44,7 @@ jobs:
           targets: aarch64-apple-darwin,wasm32-unknown-unknown
           # needed to build smart contracts
           components: rust-src
-      - uses: Swatinem/rust-cache@v2
+      - uses: Leafwing-Studios/cargo-cache@v2
       - name: Build iroha executor
         run: cargo run --bin iroha_wasm_builder -- build ./wasm_samples/default_executor --optimize --out-file ${{ env.DOCKER_COMPOSE_PATH }}/executor.wasm
       - name: Upload executor to reuse in other jobs
diff --git a/.github/workflows/iroha2-release.yml b/.github/workflows/iroha2-release.yml
index b571d69b8de..c0936738e32 100644
--- a/.github/workflows/iroha2-release.yml
+++ b/.github/workflows/iroha2-release.yml
@@ -22,7 +22,7 @@ jobs:
           targets: aarch64-apple-darwin,wasm32-unknown-unknown
           # needed to build smart contracts
           components: rust-src
-      - uses: Swatinem/rust-cache@v2
+      - uses: Leafwing-Studios/cargo-cache@v2
       - name: Build iroha executor
         run: cargo run --bin iroha_wasm_builder -- build ./wasm_samples/default_executor --optimize --out-file ${{ env.DOCKER_COMPOSE_PATH }}/executor.wasm
       - name: Upload executor to reuse in other jobs