Unbreak message cache deserializing. Related to #755.

The deserializer did not add additional fields back to the message.
Added a test for that as well.