Cache logic changed