diff --git a/.github/workflows/Android.yml b/.github/workflows/Android.yml
index 046454a00..ff472a920 100644
--- a/.github/workflows/Android.yml
+++ b/.github/workflows/Android.yml
@@ -35,8 +35,8 @@ jobs:
       uses: actions/cache@v2
       with:
         path: android-project/app/.cxx
-        key: android-cmake-v2-${{ github.sha }}
-        restore-keys: android-cmake-v2-
+        key: android-cmake-v3-${{ github.sha }}
+        restore-keys: android-cmake-v3-
 
     - name: Build
       working-directory: ${{github.workspace}}
diff --git a/.github/workflows/Linux_x86.yml b/.github/workflows/Linux_x86.yml
index 909f86145..e3d5e9912 100644
--- a/.github/workflows/Linux_x86.yml
+++ b/.github/workflows/Linux_x86.yml
@@ -26,8 +26,8 @@ jobs:
       uses: actions/cache@v2
       with:
         path: build
-        key: linux-x86-cmake-v4-${{ github.sha }}
-        restore-keys: linux-x86-cmake-v4-
+        key: linux-x86-cmake-v5-${{ github.sha }}
+        restore-keys: linux-x86-cmake-v5-
 
     - name: Configure CMake
       shell: bash
diff --git a/.github/workflows/Linux_x86_64_SDL1.yml b/.github/workflows/Linux_x86_64_SDL1.yml
index 2b77091e8..05fab2935 100644
--- a/.github/workflows/Linux_x86_64_SDL1.yml
+++ b/.github/workflows/Linux_x86_64_SDL1.yml
@@ -25,8 +25,8 @@ jobs:
       uses: actions/cache@v2
       with:
         path: build
-        key: linux-x86_64-sdl1-cmake-v3-${{ github.sha }}
-        restore-keys: linux-x86_64-sdl1-cmake-v3-
+        key: linux-x86_64-sdl1-cmake-v4-${{ github.sha }}
+        restore-keys: linux-x86_64-sdl1-cmake-v4-
 
     - name: Configure CMake
       shell: bash
diff --git a/.github/workflows/Linux_x86_64_test.yml b/.github/workflows/Linux_x86_64_test.yml
index 621c2637d..a7f11e2fe 100644
--- a/.github/workflows/Linux_x86_64_test.yml
+++ b/.github/workflows/Linux_x86_64_test.yml
@@ -26,8 +26,8 @@ jobs:
         uses: actions/cache@v3
         with:
           path: build
-          key: linux-x86-64-test-cmake-v1-${{ github.sha }}
-          restore-keys: linux-x86-64-test-cmake-v1-
+          key: linux-x86-64-test-cmake-v2-${{ github.sha }}
+          restore-keys: linux-x86-64-test-cmake-v2-
       - name: Build tests
         run: |
           cmake -S. -Bbuild -DENABLE_CODECOVERAGE=ON
diff --git a/.github/workflows/MacOSX.yml b/.github/workflows/MacOSX.yml
index 19527578c..56731b139 100644
--- a/.github/workflows/MacOSX.yml
+++ b/.github/workflows/MacOSX.yml
@@ -31,8 +31,8 @@ jobs:
       uses: actions/cache@v2
       with:
         path: build
-        key: macos-cmake-v2-${{ github.sha }}
-        restore-keys: macos-cmake-v2-
+        key: macos-cmake-v3-${{ github.sha }}
+        restore-keys: macos-cmake-v3-
 
     - name: Configure CMake
       # Use a bash shell so we can use the same syntax for environment variable
diff --git a/.github/workflows/iOS.yml b/.github/workflows/iOS.yml
index 00e4539d9..b06f7ba20 100644
--- a/.github/workflows/iOS.yml
+++ b/.github/workflows/iOS.yml
@@ -24,8 +24,8 @@ jobs:
       uses: actions/cache@v2
       with:
         path: build
-        key: ios-cmake-v2-${{ github.sha }}
-        restore-keys: ios-cmake-v2-
+        key: ios-cmake-v3-${{ github.sha }}
+        restore-keys: ios-cmake-v3-
 
     - name: Configure CMake
       # Use a bash shell so we can use the same syntax for environment variable
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec5f2c996..8f4c62a9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,9 +205,9 @@ if(GPERF)
   endif()
 endif()
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_STANDARD_REQUIRED OFF)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # for clang-tidy
 set(CMAKE_THREAD_PREFER_PTHREAD ON)
 set(THREADS_PREFER_PTHREAD_FLAG ON)