Consolidated cache data computations
Removed automatic insertion of grids into identical grid groups
p4#: 20607