Storing additional state alongside CB state restoration?