Merge "Enable cache clearing v2 logic, fix bugs."