Move bundle_cache stuff to before_install