Backed out of caching changes until they stabalise. Issue: #4
Merged master into caching