diff --git a/r5dev/core/init.cpp b/r5dev/core/init.cpp
index 815dd463..c2e311cb 100644
--- a/r5dev/core/init.cpp
+++ b/r5dev/core/init.cpp
@@ -123,6 +123,7 @@
 #endif // !DEDICATED
 #include "public/edict.h"
 #include "public/utility/binstream.h"
+#include "public/utility/sigcache.h"
 #ifndef DEDICATED
 #include "public/idebugoverlay.h"
 #include "inputsystem/inputsystem.h"
diff --git a/r5dev/core/stdafx.h b/r5dev/core/stdafx.h
index 45e98305..085c19b1 100644
--- a/r5dev/core/stdafx.h
+++ b/r5dev/core/stdafx.h
@@ -103,7 +103,6 @@
 #include "public/utility/utility.h"
 #include "public/utility/memaddr.h"
 #include "public/utility/module.h"
-#include "public/utility/sigcache.h"
 #include "public/utility/vdf_parser.h"
 
 #include "core/assert.h"
@@ -131,7 +130,6 @@ inline CModule g_SDKDll = CModule("client.dll");
 inline CModule g_GameDll = CModule("r5apex_ds.exe");
 inline CModule g_SDKDll = CModule("dedicated.dll");
 #endif // !DEDICATED
-inline CSigCache g_SigCache;
 
 #define VAR_NAME(varName)  #varName
 
diff --git a/r5dev/public/utility/sigcache.cpp b/r5dev/public/utility/sigcache.cpp
index da6cda91..3076fc79 100644
--- a/r5dev/public/utility/sigcache.cpp
+++ b/r5dev/public/utility/sigcache.cpp
@@ -67,7 +67,7 @@ bool CSigCache::FindEntry(const string& svPattern, uint64_t& nRVA) const
 {
 	if (!m_bDisabled && m_bInitialized)
 	{
-		google::protobuf::Map sMap = m_Cache.smap();
+		google::protobuf::Map<string, uint64_t> sMap = m_Cache.smap();
 		auto p = sMap.find(svPattern);
 
 		if (p != sMap.end())
@@ -253,3 +253,8 @@ bool CSigCache::CompressBlob(const size_t nSrcLen, size_t& nDstLen,
 
 	return true;
 }
+
+//-----------------------------------------------------------------------------
+// Singleton signature cache
+//-----------------------------------------------------------------------------
+CSigCache g_SigCache;
diff --git a/r5dev/public/utility/sigcache.h b/r5dev/public/utility/sigcache.h
index 2e5bbb02..708c13c2 100644
--- a/r5dev/public/utility/sigcache.h
+++ b/r5dev/public/utility/sigcache.h
@@ -40,6 +40,7 @@ private:
 	bool m_bInitialized;
 	bool m_bDisabled;
 };
+extern CSigCache g_SigCache;
 
 #pragma pack(push, 1)
 struct SigDBHeader_t