Added caching for time in current state