Fixups to allow local mirror cache