Internal caching. Ready for resource loading.
Merge branch 'develop'