support for data source cache invalidation and better field filtering