Removing the set caching code