Merge "Convert ChangesList to using MapCacheLRU"