Correctly expire timed groups. Fixes #1053

This commit presented as part 1 of Shower Fixes, fixes thought up in
the shower
Correctly remove unset options from the cache