Fix early cache resolve bug