Merge branch 'quickcache' into recommended