Rework factory/registry
Remove cache toggling from StaticCacheable
Cleanup
0.11.3