Small fix to order cache handling to prefix message-id with `lib.
Changed message-no to message-id for consistency