removed `remove_intermediate_containers`, little value, we have the cache