Enable caching. Simplify interfaces.