Improve scrolling cache

Change-Id: I726f501155de5ce6a3c27a92ef92d50b9907d1d0