More tweaks and fixes
Enable cache