Merge "Proper fix for the LRU IndexOutOfBoundsException"