Remove instance caching in case it's causing some of the newer issues