Announcements: 

- Add CategoryID and GroupID to query if present.
- Cache by CategoryID.
- Don't cache for GroupID.