Fix regression on cache option