diff --git a/tier1/KeyValues.cpp b/tier1/KeyValues.cpp
index e45695c0..b8d2b6db 100644
--- a/tier1/KeyValues.cpp
+++ b/tier1/KeyValues.cpp
@@ -46,6 +46,30 @@ void KVStringDelete(void* pMem)
 	MemAlloc_Free(pMem);
 }
 
+static bool BKeyValuesSystemSupportsCache()
+{
+	static bool s_bSupportsCache = false;
+	static bool s_bCheckedForCacheSupport = false;
+
+	if (!s_bCheckedForCacheSupport)
+	{
+		// Use Sys_LoadModule to resolve actual bin name.
+		CSysModule *pTier0 = Sys_LoadModule("tier0");
+		if (pTier0)
+		{
+#ifdef _WIN32
+			s_bSupportsCache = !!GetProcAddress(reinterpret_cast<HMODULE>(pTier0), "HushAsserts");
+#elif defined(POSIX)
+			s_bSupportsCache = !!dlsym(reinterpret_cast<void *>(pTier0), "HushAsserts");
+#endif
+		}
+
+		s_bCheckedForCacheSupport = true;
+	}
+
+	return s_bSupportsCache;
+}
+
 static const char * s_LastFileLoadingFrom = "unknown"; // just needed for error messages
 
 // Statics for the growable string table
@@ -767,8 +791,13 @@ bool KeyValues::SaveToFile( IBaseFileSystem *filesystem, const char *resourceNam
 		return false;
 	}
 
-	KeyValuesSystem()->InvalidateCacheForFile( resourceName, pathID );
-	if ( bCacheResult ) {
+	bool bSupportsCache = BKeyValuesSystemSupportsCache();
+	if (bSupportsCache)
+	{
+		KeyValuesSystem()->InvalidateCacheForFile(resourceName, pathID);
+	}
+
+	if ( bCacheResult && bSupportsCache ) {
 		KeyValuesSystem()->AddFileKeyValuesToCache( this, resourceName, pathID );
 	}
 	RecursiveSaveToFile(filesystem, f, NULL, 0, sortKeys, bAllowEmptyString );