Implement nextTick client failover
Handle rerender cases in restore