WIP: Work on cache time test.

#6205