Import and cache fix