diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 7e9bbb834a..98bacbc7ef 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -2,10 +2,10 @@ name: CodeQL Analysis
 
 on:
   push:
-    # ignore dependabot branches on push -> https://github.com/microsoft/binskim/issues/425#issuecomment-893373709
     branches-ignore:
       - 'dependabot/**'
   pull_request:
+    branches: [ '**' ]
   schedule:
     - cron: '0 8 * * *'
   workflow_dispatch:
@@ -14,14 +14,22 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
 
+      - name: Cache CodeQL database
+        uses: actions/cache@v2
+        with:
+          path: ~/.codeql
+          key: ${{ runner.os }}-codeql-${{ hashFiles('**/qlpack.yml') }}
+          restore-keys: ${{ runner.os }}-codeql-
+
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
-          languages: python
+          languages: 'python'
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
\ No newline at end of file
+        uses: github/codeql-action/analyze@v2