Merge "Converting various cache lookup option booleans to flags, so that it can easily be extended" into main