more date refactor, cache to isodate keys