bugfix find matching messages
fix cache issues