diff --git a/.github/workflows/doc-tests.yml b/.github/workflows/doc-tests.yml
index 8faa2fce12..bd01386a53 100644
--- a/.github/workflows/doc-tests.yml
+++ b/.github/workflows/doc-tests.yml
@@ -21,18 +21,31 @@ jobs:
         with:
           python-version: '3.x'
           cache: 'pip'
+      - name: Set PIPX_HOME
+        run: echo "PIPX_HOME=${{ runner.home }}/.pipx" >> $GITHUB_ENV
+
+      - name: Cache pipx environments
+        uses: actions/cache@v3
+        with:
+          path: ${{ runner.home }}/.pipx
+          # pipx is creating a cachedir.tag with unique
+          key: ${{ runner.os }}-pipx-${{ hashFiles('.pipx/.cache/CACHEDIR.TAG') }}
+          restore-keys: |
+            ${{ runner.os }}-pipx-
+
+
+      - name: Make sure latest hatch is installed
+        run: pipx upgrade hatch || pipx install hatch
 
       - name: Cache Hatch environments
         uses: actions/cache@v3
         with:
           path: .hatch_envs
+          # hatch envs are described in pyproject.toml
           key: ${{ runner.os }}-hatch-envs-${{ hashFiles('pyproject.toml') }}
           restore-keys: |
             ${{ runner.os }}-hatch-envs-
 
-      - name: Install hatch
-        run: pip install hatch
-
       - name: Set HATCH_ENV_TYPE_VIRTUAL_PATH
         run: echo "HATCH_ENV_TYPE_VIRTUAL_PATH=$(pwd)/.hatch_envs" >> $GITHUB_ENV