Persistence + expiration update