Cache did not preserve timezone information

groupby query still fails the tests and needs to be adjusted to preserve that information