Added cache expiration