Cache working - better time calc