Minor cleanup and adding more cache info handeling on both sides of the wormhole