Fixing Cache to use declare.safeMixin