changed: improved caching (or listening to it)