create a dependency injected wrapper for the cache implementation
manually bootstrapping some new classes
fix compile errors
fix bad json
Merge remote-tracking branch 'upstream/master' into filecache