fix(event cache): keep the previous-batch token when we haven't enabled storage

fix(event cache): keep the previous-batch token when we haven't enabled storage #1201