diff --git a/README.md b/README.md
index a197331..e6647c9 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ To use this action in your workflow:
 
         steps:
           - name: Poly Deploy
-            uses: polyapi/poly-deployment-action-py@v0.0.7
+            uses: polyapi/poly-deployment-action-py@v0.0.8
             with:
               poly_api_key: ${{ secrets.POLY_API_KEY }}
               poly_api_base_url: ${{ secrets.POLY_API_BASE_URL }}
diff --git a/action.yml b/action.yml
index 1723ffb..766c2e4 100644
--- a/action.yml
+++ b/action.yml
@@ -88,23 +88,31 @@ runs:
       run: |
         cd "${{ inputs.working_directory }}"
         POLY_DIR=$(python -c "import polyapi; import os; print(os.path.dirname(polyapi.__file__))")
-        mkdir -p "$POLY_DIR/poly"
-        mkdir -p "$POLY_DIR/schemas"
-        mkdir -p "$POLY_DIR/vari"
-        mkdir -p "$POLY_DIR/tabi"
-        touch "$POLY_DIR/poly"/__init__.py
-        touch "$POLY_DIR/schemas"/__init__.py
-        touch "$POLY_DIR/vari"/__init__.py
-        touch "$POLY_DIR/tabi"/__init__.py
         echo "poly_dir=$POLY_DIR" >> $GITHUB_ENV
 
+    - name: Setup and generate PolyAPI
+      id: poly_setup
+      shell: bash
+      env:
+        POLY_API_KEY: ${{ inputs.poly_api_key }}
+        POLY_API_BASE_URL: ${{ inputs.poly_api_base_url }}
+      run: |
+        set -euo pipefail
+        echo "::add-mask::${POLY_API_KEY}"
+        cd "${{ inputs.working_directory }}"
+        python -m polyapi setup
+        python -m polyapi generate --no-types
+        rm -f .polyapi/config.json ~/.polyapi/config.json 2>/dev/null || true
+
     - name: Restore cached PolyAPI deployments
       uses: actions/cache@v4
       with:
-        path: ${{ env.poly_dir }}
-        key: "${{ runner.os }}-poly-${{ inputs.poly_api_base_url }}"
+        path: | 
+          ${{ env.poly_dir }}/cached_deployables
+          ${{ env.poly_dir }}/deployments_revision
+        key: "${{ runner.os }}-poly-deployables-${{ inputs.poly_api_base_url }}-${{inputs.working_directory}}"
         restore-keys: |
-          "${{ runner.os }}-poly-"
+          "${{ runner.os }}-poly-deployables-"
 
     - name: Deploy
       id: deploy
@@ -113,16 +121,21 @@ runs:
         POLY_API_KEY: ${{ inputs.poly_api_key }}
         POLY_API_BASE_URL: ${{ inputs.poly_api_base_url }}
       run: |
+        set -euo pipefail
+        echo "::add-mask::${POLY_API_KEY}"
         cd "${{ inputs.working_directory }}"
         python -m polyapi sync
+        rm -f .polyapi/config.json ~/.polyapi/config.json 2>/dev/null || true
 
     - name: Cache PolyAPI deployments
       uses: actions/cache@v4
       with:
-        path: ${{ env.poly_dir }}
-        key: ${{ runner.os }}-poly-${{ inputs.poly_api_base_url }}
+        path: | 
+          ${{ env.poly_dir }}/cached_deployables
+          ${{ env.poly_dir }}/deployments_revision
+        key: "${{ runner.os }}-poly-deployables-${{ inputs.poly_api_base_url }}-${{inputs.working_directory}}"
         restore-keys: |
-          ${{ runner.os }}-poly-
+          "${{ runner.os }}-poly-deployables-"
 
     - name: Commit deployment receipts
       shell: bash