Add routing / p2p config
Store the cached message id in the payload, don't misuse messageID
Don't misuse message id to identify cached message