performance boosts for temp/cache
Merge remote branch 'upstream/master'