Merge "MapCacheLRU: Properly handle bogus cache keys"