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.

(cherry picked from commit 674b4f82aa5c0f5dd40842a1b43b65b25e768c04)