diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 844ded3828..62fd17d3ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -217,35 +217,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [x86_64, i686]
         include:
           - platform: x86_64
             distro: bionic
             image: openrct2/openrct2-build:0.3.1-bionic
-            cache_key: linux-portable
             build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz"
           - platform: x86_64
             distro: focal
             image: openrct2/openrct2-build:5-focal
-            cache_key: linux-portable
             build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz"
           - platform: x86_64
             distro: bullseye
             image: openrct2/openrct2-build:5-bullseye
-            cache_key: linux-portable
             build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz"
           - platform: i686
             distro: bionic
             image: openrct2/openrct2-build:0.3.1-bionic32
-            cache_key: linux-portable-32
-            build_flags: -DFORCE32=ON -DENABLE_SCRIPTING=OFF -DCMAKE_CXX_FLAGS="-m32 -gz"
+            build_flags: -DFORCE32=ON -DENABLE_SCRIPTING=OFF -DCMAKE_CXX_FLAGS="-m32 -g -gz"
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1
         with:
-          key: ${{ matrix.cache_key }}
+          key: linux-${{ matrix.platform }}-${{ matrix.distro }}
       - name: Get pre-reqs
         run: . scripts/setenv && get-discord-rpc
       - name: Build OpenRCT2