Flushing cache better on import