refactor(template_cache_generator): minor change: extract function
doc(watch_group): Fix comments

To sync with 3de00bd4902d20137dad0b551312eceb9a599d98