More cache expiration refinement