Bring back the caching to the calendar page.

#5414