more fine grained runtime api caching + a fix for av-store (#3457)

* finer grained runtime-api caching

* fix av-store

* simplify a request

* remove unused imports

* fix tests