- POM cleanup
- some cacheable entities