Fixed issue with Cached data grid