Couple changes for v2 and removing caching.