We need to find a way to avoid replaying the whole stream and deliver while we store.