More caching in domain
Merge branch 'local'