Removed caching from setup