diff --git a/lib/rt64 b/lib/rt64
index ce3e9c7..0fd6d05 160000
--- a/lib/rt64
+++ b/lib/rt64
@@ -1 +1 @@
-Subproject commit ce3e9c762998302d90b37a0790a54834f4598df1
+Subproject commit 0fd6d05b8a0ec5daae313ad9e8504812ec31775d
diff --git a/src/main/main.cpp b/src/main/main.cpp
index 9af7e41..99d940b 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -28,10 +28,6 @@
 #include "ovl_patches.hpp"
 #include "librecomp/game.hpp"
 
-#ifdef HAS_MM_SHADER_CACHE
-#include "mm_shader_cache.h"
-#endif
-
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
@@ -325,18 +321,12 @@ RspUcodeFunc* get_rsp_microcode(const OSTask* task) {
 extern "C" void recomp_entrypoint(uint8_t * rdram, recomp_context * ctx);
 gpr get_entrypoint_address();
 
-// TODO DO NOT MERGE THIS BRANCH WITHOUT REENABLING THE SHADER CACHE
-#undef HAS_MM_SHADER_CACHE
-
 // array of supported GameEntry objects
 std::vector<recomp::GameEntry> supported_games = {
     {
         .rom_hash = 0xEF18B4A9E2386169ULL,
         .internal_name = "ZELDA MAJORA'S MASK",
         .game_id = u8"mm.n64.us.1.0",
-#ifdef HAS_MM_SHADER_CACHE
-        .cache_data = {mm_shader_cache_bytes, sizeof(mm_shader_cache_bytes)},
-#endif
         .is_enabled = true,
         .entrypoint_address = get_entrypoint_address(),
         .entrypoint = recomp_entrypoint,