Merge "Avoid MapCacheLRU error when MessageCache fails to load"