Merge change 813 into donut

* changes:
  Speed up calendar by caching various resources