diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 80959c8..f443b3e 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -16,7 +16,14 @@ jobs:
           registry: ${{ vars.CONTAINER_REGISTRY }}
           username: ${{ vars.CONTAINER_REGISTRY_USERNAME }}
           password: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
+      - name: Restore fetch cache
+        id: cache-fetch
+        uses: actions/cache@v4
+        with:
+          path: fetch
+          key: ${{ hashFiles('src/fetch.py') }}
       - name: Fetch stage0
+        if: steps.cache-fetch.outputs.cache-hit != 'true'
         run: |
           python3 ./src/fetch.py stage0
       - name: Build stage0
@@ -24,9 +31,7 @@ jobs:
           CONTAINER_REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
         run: |
           make registry-bootstrap-stage0 REGISTRY_USERNAME=$CONTAINER_REGISTRY/okami101/stagex
-      - name: Build stage1
-        env:
-          CONTAINER_REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
+      - name: Test Rebuild Cache
         run: |
           ls
       # - name: Build stage1