caching and loader updates
Merge branch 'master' of github.com:theodi/tsb-project-data