Moved 'Remove' from extension to Cache class