Update grid and caching