Merge branch 'beta'
Re-enable cache.