Improve base builder and base final caching

Merge request reports

Loading