Fix datagrid caching