Add explicit cache back