Move cache layer to timeNow to enable testing
todo++