Fix import and cache configuration