Time cache 2

Fixed code review comments from Eric.