Bug 7432 : Fix how we are setting expiry time when caching