REFACTORING: LayoutCaching -> SimpleLayoutCaching