Rewrites allowing caching optimizations