Add flag to skip cache