Merge "MultiTableMapCacheTest test update"