Remove instance cache
Merge branch 'remove-inst-cache'