diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 92bda4b7..1f260799 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -15,23 +15,6 @@ jobs:
   check:
     name: Check
     runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: abelfodil/protoc-action@v1
-        with:
-          protoc-version: '3.19.4'
-      - uses: actions-rs/cargo@v1
-        with:
-          command: check
-
-  test:
-    name: Test Suite
-    runs-on: ubuntu-latest
     services:
       infinispan:
         image: infinispan/server:11.0.9.Final
@@ -42,23 +25,72 @@ jobs:
           PASS: password
     steps:
       - uses: actions/checkout@v2
-      - uses: supercharge/redis-github-action@1.1.0
-        with:
-          redis-version: 5
-      # Nightly is required for code coverage with doctests
-      # https://github.com/taiki-e/cargo-llvm-cov/issues/2
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: stable
           override: true
+      - name: Set up cargo cache
+        uses: actions/cache@v3
+        continue-on-error: false
+        with:
+          path: |
+            ~/.cargo
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
       - uses: abelfodil/protoc-action@v1
         with:
           protoc-version: '3.19.4'
       - uses: actions-rs/cargo@v1
+        with:
+          command: check
+      - uses: supercharge/redis-github-action@1.1.0
+        with:
+          redis-version: 5
+      - name: Test Suite
+        uses: actions-rs/cargo@v1
         with:
           command: test
           args: --all-features -vv
+      - name: Clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --all-features --all-targets -- -D warnings
+      - name: Bench
+        uses: actions-rs/cargo@v1
+        with:
+          command: bench
+
+#  test:
+#    name: Test Suite
+#    runs-on: ubuntu-latest
+#    services:
+#      infinispan:
+#        image: infinispan/server:11.0.9.Final
+#        ports:
+#          - 11222:11222
+#        env:
+#          USER: username
+#          PASS: password
+#    steps:
+#      - uses: actions/checkout@v2
+#      - uses: supercharge/redis-github-action@1.1.0
+#        with:
+#          redis-version: 5
+#      - uses: actions-rs/toolchain@v1
+#        with:
+#          profile: minimal
+#          toolchain: stable
+#          override: true
+#      - uses: abelfodil/protoc-action@v1
+#        with:
+#          protoc-version: '3.19.4'
+#      - uses: actions-rs/cargo@v1
+#        with:
+#          command: test
+#          args: --all-features -vv
 
   fmt:
     name: Rustfmt
@@ -76,44 +108,45 @@ jobs:
           command: fmt
           args: --all -- --check
 
-  clippy:
-    name: Clippy
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - run: rustup component add clippy
-      - uses: abelfodil/protoc-action@v1
-        with:
-          protoc-version: '3.19.4'
-      - uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --all-features --all-targets -- -D warnings
+#  clippy:
+#    needs: check
+#    name: Clippy
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v2
+#      - uses: actions-rs/toolchain@v1
+#        with:
+#          profile: minimal
+#          toolchain: stable
+#          override: true
+#      - run: rustup component add clippy
+#      - uses: abelfodil/protoc-action@v1
+#        with:
+#          protoc-version: '3.19.4'
+#      - uses: actions-rs/cargo@v1
+#        with:
+#          command: clippy
+#          args: --all-features --all-targets -- -D warnings
 
-  bench:
-    name: Bench
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: supercharge/redis-github-action@1.1.0
-        with:
-          redis-version: 5
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: abelfodil/protoc-action@v1
-        with:
-          protoc-version: '3.19.4'
-      - uses: actions-rs/cargo@v1
-        with:
-          command: bench
+#  bench:
+#    name: Bench
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v2
+#      - uses: supercharge/redis-github-action@1.1.0
+#        with:
+#          redis-version: 5
+#      - uses: actions-rs/toolchain@v1
+#        with:
+#          profile: minimal
+#          toolchain: stable
+#          override: true
+#      - uses: abelfodil/protoc-action@v1
+#        with:
+#          protoc-version: '3.19.4'
+#      - uses: actions-rs/cargo@v1
+#        with:
+#          command: bench
 
   wasm-build:
     name: Build for WASM