Commented out the caching stuff for now.
Merge remote-tracking branch 'origin/master'