Revert "Revert "Improve scrolling cache""

This reverts commit 29fbc31cc1056aaf97a46441f5496847626aeb53.