fix listeners caching