Added manual caching framework.
Merge branch 'master' into gh-pages