Time cache 2

Addressed code review comments.