Refactor date simplication, re-use in cache_between method