Remove caching as it has some side effects for failing tests
Sync with Thomas changes, add bootstrap call
Merge remote-tracking branch 'origin/master'