Move marking of groups as dirty to cache event handler
Rename