Improvements for cached builder page