diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 4bc07d59..3a503688 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -66,8 +66,8 @@ jobs:
         uses: actions/cache@v2
         id: cache-binaryen
         with:
-          key: binaryen-v1
-          path: build/binaryen
+          key: binaryen-windows-v2
+          path: build/wasm-opt.exe
       - name: Build Binaryen
         if: steps.cache-binaryen.outputs.cache-hit != 'true'
         run: make binaryen
diff --git a/Makefile b/Makefile
index 27ec7e7f..44b100de 100644
--- a/Makefile
+++ b/Makefile
@@ -176,10 +176,10 @@ $(LLVM_BUILDDIR): $(LLVM_BUILDDIR)/build.ninja
 
 # Build Binaryen
 .PHONY: binaryen
-binaryen: build/wasm-opt
-build/wasm-opt:
+binaryen: build/wasm-opt$(EXE)
+build/wasm-opt$(EXE):
 	cd lib/binaryen && cmake -G Ninja . -DBUILD_STATIC_LIB=ON $(BINARYEN_OPTION) && ninja bin/wasm-opt$(EXE)
-	cp lib/binaryen/bin/wasm-opt build/wasm-opt
+	cp lib/binaryen/bin/wasm-opt$(EXE) build/wasm-opt$(EXE)
 
 # Build wasi-libc sysroot
 .PHONY: wasi-libc