Update to use the egg cache as well