Added caching with support in the autoloader
Merge branch 'master' into website