Adding cache expiration