diff --git a/OpenRA.Game/FieldSaver.cs b/OpenRA.Game/FieldSaver.cs
index 90f9fc9624..9795653302 100644
--- a/OpenRA.Game/FieldSaver.cs
+++ b/OpenRA.Game/FieldSaver.cs
@@ -82,6 +82,9 @@ namespace OpenRA
 				return elems.JoinWith(", ");
 			}
 
+			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(OpenRA.Primitives.Cache<,>))
+				return ""; // TODO
+
 			if (t == typeof(DateTime))
 				return ((DateTime)v).ToString("yyyy-MM-dd HH-mm-ss", CultureInfo.InvariantCulture);
 
diff --git a/OpenRA.Utility/Command.cs b/OpenRA.Utility/Command.cs
index 907471c3e9..3de900d1c0 100644
--- a/OpenRA.Utility/Command.cs
+++ b/OpenRA.Utility/Command.cs
@@ -257,6 +257,9 @@ namespace OpenRA.Utility
 			if (t.IsSubclassOf(typeof(Array)))
 				return "Multiple {0}".F(FriendlyTypeName(t.GetElementType()));
 
+			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(OpenRA.Primitives.Cache<,>))
+				return "Cached<{0},{1}>".F(t.GetGenericArguments().Select(FriendlyTypeName).ToArray());
+
 			if (t == typeof(int) || t == typeof(uint))
 				return "Integer";