Simplify the builder to not need a separate Cache