Caching for the loader
Merge branch 'loader'

Conflicts:
	src/loader.js