diff --git a/.appveyor.yml b/.appveyor.yml
index bd4a7b0ca82..b04e7d9ce80 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -12,6 +12,9 @@ environment:
       TARGET: release_debug
       ARCH: amd64
 
+init:
+  - ps: if ($env:APPVEYOR_REPO_BRANCH -ne "master") { $env:APPVEYOR_CACHE_SKIP_SAVE = "true" }
+
 cache:
   - "%SCONS_CACHE_ROOT%"
 
@@ -26,7 +29,7 @@ before_build:
   - python --version
   - scons --version
   - cl.exe
-  - SET "SCONS_CACHE=%SCONS_CACHE_ROOT%\master"
+  - set "SCONS_CACHE=%SCONS_CACHE_ROOT%\%APPVEYOR_REPO_BRANCH%"
 
 build_script:
-- scons platform=%GD_PLATFORM% target=%TARGET% tools=%TOOLS% debug_symbols=no verbose=yes progress=no gdnative_wrapper=yes
+  - scons platform=%GD_PLATFORM% target=%TARGET% tools=%TOOLS% debug_symbols=no verbose=yes progress=no gdnative_wrapper=yes