Ensure caching is done on a per-site, per-calendar basis
Slightly better handling of default date ranges for calendar view