diff --git a/.circleci/config.yml b/.circleci/config.yml
index 26a162e0..be9c6372 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -104,6 +104,15 @@ jobs:
             # Checkout the code
             - checkout
 
+            - run:
+                name: Create hash of toolchains
+                command: |
+                    .circleci/create-hash.sh
+
+            - restore_cache:
+                keys:
+                    - riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }}
+
             - restore_cache:
                 keys:
                     - verilator-installed-v1-{{ checksum "sims/verisim/verilator.mk" }}
@@ -138,10 +147,6 @@ jobs:
                 keys:
                     - riscv-tools-installed-v1-{{ checksum "../riscv-tools.hash" }}
 
-            - restore_cache:
-                keys:
-                    - esp-tools-installed-v1-{{ checksum "../esp-tools.hash" }}
-
             - restore_cache:
                 keys:
                     - example-{{ .Branch }}-{{ .Revision }}