Fix imports in cache