Use old date ranges for now

This lets us merge to main without moving to the new baseline yet.

Also add data day to the cache key so that we don't mistakenly reuse cache that used a different data day.