Make fewer calls to Eureka