Improve scrolling cache

Change-Id: Iad433d2282a8bb01f895ec2d6227608e36243f3b