diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cfb29139db..bdcae86b2e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,18 +14,14 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Init submodules
-        # This is done as part of pretest but as we are caching the nim binary
-        # which is inside the submodule, better initialising them before
-        # recovering the binary.
-        run: git submodule update --init --recursive
-
       - name: Cache nim-waku binary
         uses: actions/cache@v2
         with:
-          path: ./nim-waku/build/wakunode2
+          path: |
+            ./nim-waku/build/wakunode2
+            ./nim-waku/vendor/rln/target/debug
           # The nim-waku version is set by the .gitmodules file as it is a submodule
-          key: nim-waku-build-v1-${{ hashFiles('.gitmodules') }}
+          key: nim-waku-build-v2-${{ hashFiles('.gitmodules') }}
 
       - name: Install bufbuild
         uses: mu-io/setup-buf@v1beta
diff --git a/package.json b/package.json
index e7ff1054cd..ce9b875a1f 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "fix:prettier": "prettier \"src/**/*.ts\" --write",
     "fix:lint": "eslint src --ext .ts --fix",
     "pretest": "run-s pretest:*",
-    "pretest:1-init-git-submodules": "git submodule update --init --recursive",
+    "pretest:1-init-git-submodules": "[ -f './nim-waku/build/wakunode2' ] || git submodule update --init --recursive",
     "pretest:2-build-nim-waku": "cd nim-waku; [ -f './build/wakunode2' ] || make -j$(nproc --all 2>/dev/null || echo 2) wakunode2",
     "test": "run-s build test:*",
     "test:lint": "eslint src --ext .ts",