diff --git a/src/Cafe/HW/Latte/Core/FetchShader.cpp b/src/Cafe/HW/Latte/Core/FetchShader.cpp
index 272b7c0b..5933fe05 100644
--- a/src/Cafe/HW/Latte/Core/FetchShader.cpp
+++ b/src/Cafe/HW/Latte/Core/FetchShader.cpp
@@ -8,7 +8,6 @@
 #include "Cafe/HW/Latte/LegacyShaderDecompiler/LatteDecompilerInstructions.h"
 #include "Cafe/HW/Latte/Core/FetchShader.h"
 #include "Cafe/HW/Latte/ISA/LatteInstructions.h"
-#include "HW/Latte/Renderer/Renderer.h"
 #include "util/containers/LookupTableL3.h"
 #include "util/helpers/fspinlock.h"
 #include <openssl/sha.h> /* SHA1_DIGEST_LENGTH */
@@ -108,14 +107,6 @@ void LatteShader_calculateFSKey(LatteFetchShader* fetchShader)
 			key += (uint64)(attrib->offset & 3);
 			key = std::rotl<uint64>(key, 2);
 		}
-
-		// TODO: also check if geometry shader is used
-		if (g_renderer->GetType() == RendererAPI::Metal)
-		{
-		    key += (uint64)group.attributeBufferIndex;
-			key = std::rotl<uint64>(key, 5);
-			// TODO: hash the stride as well
-		}
 	}
 	// todo - also hash invalid buffer groups?
 	fetchShader->key = key;
@@ -155,6 +146,23 @@ void LatteFetchShader::CalculateFetchShaderVkHash()
 	this->vkPipelineHashFragment = h;
 }
 
+void LatteFetchShader::CalculateFetchShaderMtlObjectShaderHash(uint32* contextRegister)
+{uint64 key = 0;
+	for (sint32 g = 0; g < bufferGroups.size(); g++)
+	{
+	    LatteParsedFetchShaderBufferGroup_t& group = bufferGroups[g];
+		uint32 bufferIndex = group.attributeBufferIndex;
+		uint32 bufferBaseRegisterIndex = mmSQ_VTX_ATTRIBUTE_BLOCK_START + bufferIndex * 7;
+		uint32 bufferStride = (contextRegister[bufferBaseRegisterIndex + 2] >> 11) & 0xFFFF;
+
+	    key += (uint64)bufferIndex;
+		key = std::rotl<uint64>(key, 5);
+        key += (uint64)bufferStride;
+		key = std::rotl<uint64>(key, 5);
+	}
+	mtlShaderHashObject = key;
+}
+
 void _fetchShaderDecompiler_parseInstruction_VTX_SEMANTIC(LatteFetchShader* parsedFetchShader, uint32* contextRegister, const LatteClauseInstruction_VTX* instr)
 {
 	uint32 semanticId = instr->getFieldSEM_SEMANTIC_ID(); // location (attribute index inside shader)
@@ -337,6 +345,7 @@ LatteFetchShader* LatteShaderRecompiler_createFetchShader(LatteFetchShader::Cach
 		// these only make sense when vertex shader does not call FS?
 		LatteShader_calculateFSKey(newFetchShader);
 		newFetchShader->CalculateFetchShaderVkHash();
+		newFetchShader->CalculateFetchShaderMtlObjectShaderHash(contextRegister);
 		return newFetchShader;
 	}
 
@@ -396,6 +405,7 @@ LatteFetchShader* LatteShaderRecompiler_createFetchShader(LatteFetchShader::Cach
 	}
 	LatteShader_calculateFSKey(newFetchShader);
 	newFetchShader->CalculateFetchShaderVkHash();
+	newFetchShader->CalculateFetchShaderMtlObjectShaderHash(contextRegister);
 
 	// register in cache
 	// its possible that during multi-threaded shader cache loading, two identical (same hash) fetch shaders get created simultaneously
diff --git a/src/Cafe/HW/Latte/Core/FetchShader.h b/src/Cafe/HW/Latte/Core/FetchShader.h
index ac57714d..9aeed6bd 100644
--- a/src/Cafe/HW/Latte/Core/FetchShader.h
+++ b/src/Cafe/HW/Latte/Core/FetchShader.h
@@ -46,6 +46,9 @@ struct LatteFetchShader
 	// Vulkan
 	uint64 vkPipelineHashFragment{}; // hash of all fetch shader state that influences the Vulkan graphics pipeline
 
+	// Metal
+	uint64 mtlShaderHashObject{};
+
 	// cache info
 	CacheHash m_cacheHash{};
 	bool m_isRegistered{}; // if true, fetch shader is referenced by cache (RegisterInCache() succeeded)
@@ -53,6 +56,8 @@ struct LatteFetchShader
 
 	void CalculateFetchShaderVkHash();
 
+	void CalculateFetchShaderMtlObjectShaderHash(uint32* contextRegister);
+
 	uint64 getVkPipelineHashFragment() const { return vkPipelineHashFragment; };
 
 	static bool isValidBufferIndex(const uint32 index) { return index < 0x10; };
@@ -69,4 +74,4 @@ struct LatteFetchShader
 	static std::unordered_map<CacheHash, LatteFetchShader*> s_fetchShaderByHash;
 };
 
-LatteFetchShader* LatteShaderRecompiler_createFetchShader(LatteFetchShader::CacheHash fsHash, uint32* contextRegister, uint32* fsProgramCode, uint32 fsProgramSize);
\ No newline at end of file
+LatteFetchShader* LatteShaderRecompiler_createFetchShader(LatteFetchShader::CacheHash fsHash, uint32* contextRegister, uint32* fsProgramCode, uint32 fsProgramSize);
diff --git a/src/Cafe/HW/Latte/Core/LatteShader.cpp b/src/Cafe/HW/Latte/Core/LatteShader.cpp
index 3ac0e9d2..d20067a6 100644
--- a/src/Cafe/HW/Latte/Core/LatteShader.cpp
+++ b/src/Cafe/HW/Latte/Core/LatteShader.cpp
@@ -498,6 +498,8 @@ void LatteSHRC_UpdateVSBaseHash(uint8* vertexShaderPtr, uint32 vertexShaderSize,
 	uint64 vsHash2 = 0;
 	_calculateShaderProgramHash(vsProgramCode, vertexShaderSize, &hashCacheVS, &vsHash1, &vsHash2);
 	uint64 vsHash = vsHash1 + vsHash2 + _activeFetchShader->key + _activePSImportTable.key + (usesGeometryShader ? 0x1111ULL : 0ULL);
+	if (g_renderer->GetType() == RendererAPI::Metal && usesGeometryShader)
+	    vsHash += _activeFetchShader->mtlShaderHashObject;
 
 	uint32 tmp = LatteGPUState.contextNew.PA_CL_VTE_CNTL.getRawValue() ^ 0x43F;
 	vsHash += tmp;
diff --git a/src/Cafe/HW/Latte/Renderer/Metal/MetalPipelineCache.cpp b/src/Cafe/HW/Latte/Renderer/Metal/MetalPipelineCache.cpp
index a138ec8c..9a99f138 100644
--- a/src/Cafe/HW/Latte/Renderer/Metal/MetalPipelineCache.cpp
+++ b/src/Cafe/HW/Latte/Renderer/Metal/MetalPipelineCache.cpp
@@ -1,7 +1,6 @@
 #include "Cafe/HW/Latte/Renderer/Metal/MetalCommon.h"
 #include "Cafe/HW/Latte/Renderer/Metal/MetalPipelineCache.h"
 #include "Cafe/HW/Latte/Renderer/Metal/MetalRenderer.h"
-#include "Foundation/NSObject.hpp"
 #include "HW/Latte/Core/LatteShader.h"
 #include "HW/Latte/Renderer/Metal/CachedFBOMtl.h"
 #include "HW/Latte/Renderer/Metal/LatteToMtl.h"
@@ -10,7 +9,6 @@
 
 #include "HW/Latte/Core/FetchShader.h"
 #include "HW/Latte/ISA/RegDefines.h"
-#include "Metal/MTLRenderPipeline.hpp"
 #include "config/ActiveSettings.h"
 
 static void rectsEmulationGS_outputSingleVertex(std::string& gsSrc, const LatteDecompilerShader* vertexShader, LatteShaderPSInputTable* psInputTable, sint32 vIdx, const LatteContextRegister& latteRegister)