ENHANCEMENT: New calendar caching