added cache etc. to message_handler