improved caching/throttling