Fix patch to disable instance caching for now.