Update master with develop

Merging in caching fixes.