Fix typo
Revert to original layered-cache algorithm
Merge branch 'master' into struct-editor