Made cached loading work.
Merge branch 'feature/caching'