More work on DomainCache