Always cache the unit when popping the state.