Caching is actually checked now
Merge branch 'master' into issue_6

Conflicts:
	scroll.py