Add cancel reference storage and RPC support