Segregate shipyard buildable from body buildable in cache.  Fix sacrifice for new upgrade method.