Added date transformations
Improved caching