Cache time 2

Addressed code review comments from cache-time branch.