Amend: Changed time cache object to have single setter for setting fields, changed map to identity map
Change-Id: I598e9033187b794631d1dbfc78bb018084ec95cf
Former-commit-id: 424c6e0b1b [formerly 8fc766ab05 [formerly 9a5766f8a6bd61734b2f9e44aaabbef835d1d676]]
Former-commit-id: 8fc766ab05
Former-commit-id: dbc9141454