Still trying to fix cache issue on import