simple formatting change
explicitly calling super constructor
no need to keep the MessageEnvelope here
Revert "no need to keep the MessageEnvelope here"

This reverts commit c9dff2aa3d9c9330e263b58c0fa00544d0819811.
support for caching discovery results