diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index edaaddb..ad25c28 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,14 +20,7 @@ jobs:
       - name: install target
         run: rustup target add aarch64-apple-darwin
 
-      - name: cargo cache artifacts
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-${{ runner.arch }}-cargo-build-target-${{ hashFiles('Cargo.lock') }}
+      - uses: Swatinem/rust-cache@v2
 
       - name: build
         run: cargo build --package cli --release --target aarch64-apple-darwin
@@ -66,14 +59,7 @@ jobs:
       - name: install target
         run: rustup target add x86_64-apple-darwin
 
-      - name: cargo cache artifacts
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-${{ runner.arch }}-cargo-build-target-${{ hashFiles('Cargo.lock') }}
+      - uses: Swatinem/rust-cache@v2
 
       - name: build
         run: cargo build --package cli --release --target x86_64-apple-darwin	
@@ -118,14 +104,7 @@ jobs:
           sudo apt-get install -y gcc-aarch64-linux-gnu
           echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
 
-      - name: cargo cache artifacts
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-${{ runner.arch }}-cargo-build-target-${{ hashFiles('Cargo.lock') }}
+      - uses: Swatinem/rust-cache@v2
 
       - name: build
         run: cargo build --package cli --release --target aarch64-unknown-linux-gnu
@@ -164,14 +143,7 @@ jobs:
       - name: install target
         run: rustup target add x86_64-unknown-linux-gnu
 
-      - name: cargo cache artifacts
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-${{ runner.arch }}-cargo-build-target-${{ hashFiles('Cargo.lock') }}
+      - uses: Swatinem/rust-cache@v2
 
       - name: build
         run: cargo build --package cli --release --target x86_64-unknown-linux-gnu
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fe102de..295d046 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,13 +17,7 @@ jobs:
           profile: minimal
           toolchain: nightly
           override: true
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-${{ runner.arch }}-cargo-build-target-${{ hashFiles('Cargo.lock') }}
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/cargo@v1
         with:
           command: check
@@ -38,13 +32,7 @@ jobs:
           profile: minimal
           toolchain: nightly
           override: true
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-${{ runner.arch }}-cargo-build-target-${{ hashFiles('Cargo.lock') }}
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/cargo@v1
         with:
           command: test
@@ -61,13 +49,7 @@ jobs:
           toolchain: nightly
           override: true
           components: rustfmt
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-${{ runner.arch }}-cargo-build-target-${{ hashFiles('Cargo.lock') }}
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/cargo@v1
         with:
           command: fmt
@@ -84,13 +66,7 @@ jobs:
           toolchain: nightly
           override: true
           components: clippy
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-${{ runner.arch }}-cargo-build-target-${{ hashFiles('Cargo.lock') }}
+      - uses: Swatinem/rust-cache@v2
       - uses: actions-rs/cargo@v1
         with:
           command: clippy
diff --git a/client/src/rpc.rs b/client/src/rpc.rs
index 4b9b6c8..470b3d7 100644
--- a/client/src/rpc.rs
+++ b/client/src/rpc.rs
@@ -192,7 +192,7 @@ impl<R: ExecutionRpc> EthRpcServer for RpcInner<R> {
         let node = self.node.read().await;
         let code = convert_err(node.get_code(&address, block).await)?;
 
-        Ok(hex::encode(code))
+        Ok(format!("0x{:}", hex::encode(code)))
     }
 
     async fn call(&self, opts: CallOpts, block: BlockTag) -> Result<String, Error> {