Revert "Cache grouping fixes"

This reverts commit d62bf5556d1d3da260a93ff59edc80e6fefe9979.