New tasks & misc improvements to Cache