integrate @snappytv query cache fix