Include Calendar in default package

Included the calendar control in the default package.
Adjust logging and caching