Merge "Allow two-queue style insertion in MapCacheLRU"