Remove instance cache
Merge branch 'remove-inst-cache'
Merge branch 'master' into struct-editor