and add support for not query-caching scopemasked answers