diff --git a/GPU/GLES/DrawEngineGLES.cpp b/GPU/GLES/DrawEngineGLES.cpp
index 8bd39eadb4..dd3395abd2 100644
--- a/GPU/GLES/DrawEngineGLES.cpp
+++ b/GPU/GLES/DrawEngineGLES.cpp
@@ -474,6 +474,7 @@ bool DrawEngineGLES::IsCodePtrVertexDecoder(const u8 *ptr) const {
 	return decJitCache_->IsInSpace(ptr);
 }
 
+// TODO: Refactor this to a single USE flag.
 bool DrawEngineGLES::SupportsHWTessellation() const {
 	bool hasTexelFetch = gl_extensions.GLES3 || (!gl_extensions.IsGLES && gl_extensions.VersionGEThan(3, 3, 0)) || gl_extensions.EXT_gpu_shader4;
 	return hasTexelFetch && gstate_c.UseAll(GPU_USE_VERTEX_TEXTURE_FETCH | GPU_USE_TEXTURE_FLOAT | GPU_USE_INSTANCE_RENDERING);
diff --git a/GPU/GLES/ShaderManagerGLES.cpp b/GPU/GLES/ShaderManagerGLES.cpp
index 1c7bd4296b..055d626b28 100644
--- a/GPU/GLES/ShaderManagerGLES.cpp
+++ b/GPU/GLES/ShaderManagerGLES.cpp
@@ -935,7 +935,7 @@ std::string ShaderManagerGLES::DebugGetShaderString(std::string id, DebugShaderT
 // as sometimes these features might have an effect on the ID bits.
 
 #define CACHE_HEADER_MAGIC 0x83277592
-#define CACHE_VERSION 15
+#define CACHE_VERSION 16
 struct CacheHeader {
 	uint32_t magic;
 	uint32_t version;
diff --git a/GPU/GPUState.h b/GPU/GPUState.h
index d34b824c8a..272b39d70e 100644
--- a/GPU/GPUState.h
+++ b/GPU/GPUState.h
@@ -478,7 +478,7 @@ enum {
 	GPU_USE_BLEND_MINMAX = FLAG_BIT(4),
 	GPU_USE_LOGIC_OP = FLAG_BIT(5),
 	GPU_USE_DEPTH_RANGE_HACK = FLAG_BIT(6),
-	// Free bit: 7
+	GPU_USE_TEXTURE_NPOT = FLAG_BIT(7),
 	GPU_USE_ANISOTROPY = FLAG_BIT(8),
 	GPU_USE_CLEAR_RAM_HACK = FLAG_BIT(9),
 	GPU_USE_INSTANCE_RENDERING = FLAG_BIT(10),
@@ -486,21 +486,17 @@ enum {
 	GPU_USE_TEXTURE_FLOAT = FLAG_BIT(12),
 	GPU_USE_16BIT_FORMATS = FLAG_BIT(13),
 	GPU_USE_DEPTH_CLAMP = FLAG_BIT(14),
-	// Free bit: 15
+	GPU_USE_TEXTURE_LOD_CONTROL = FLAG_BIT(15),
 	GPU_USE_DEPTH_TEXTURE = FLAG_BIT(16),
 	GPU_USE_ACCURATE_DEPTH = FLAG_BIT(17),
 	GPU_USE_GS_CULLING = FLAG_BIT(18),  // Geometry shader
-	// Free bit: 19
+	GPU_USE_REVERSE_COLOR_ORDER = FLAG_BIT(19),
 	GPU_USE_FRAMEBUFFER_FETCH = FLAG_BIT(20),
 	GPU_SCALE_DEPTH_FROM_24BIT_TO_16BIT = FLAG_BIT(21),
 	GPU_ROUND_FRAGMENT_DEPTH_TO_16BIT = FLAG_BIT(22),
 	GPU_ROUND_DEPTH_TO_16BIT = FLAG_BIT(23),  // Can be disabled either per game or if we use a real 16-bit depth buffer
-	GPU_USE_TEXTURE_LOD_CONTROL = FLAG_BIT(24),
-	// Free bits: 25-27
-	GPU_USE_TEXTURE_NPOT = FLAG_BIT(28),
-	GPU_USE_CLIP_DISTANCE = FLAG_BIT(29),
-	GPU_USE_CULL_DISTANCE = FLAG_BIT(30),
-	GPU_USE_REVERSE_COLOR_ORDER = FLAG_BIT(31),
+	GPU_USE_CLIP_DISTANCE = FLAG_BIT(24),
+	GPU_USE_CULL_DISTANCE = FLAG_BIT(25),
 };
 
 struct KnownVertexBounds {
diff --git a/GPU/Vulkan/ShaderManagerVulkan.cpp b/GPU/Vulkan/ShaderManagerVulkan.cpp
index 97eb00c490..72a20476c0 100644
--- a/GPU/Vulkan/ShaderManagerVulkan.cpp
+++ b/GPU/Vulkan/ShaderManagerVulkan.cpp
@@ -482,7 +482,7 @@ VulkanGeometryShader *ShaderManagerVulkan::GetGeometryShaderFromModule(VkShaderM
 // instantaneous.
 
 #define CACHE_HEADER_MAGIC 0xff51f420 
-#define CACHE_VERSION 29
+#define CACHE_VERSION 30
 struct VulkanCacheHeader {
 	uint32_t magic;
 	uint32_t version;