Merge "Refactor cache behavior from "atmoic" to "group"."