Supporting better caching and grid layouts.