Merge "Converting some caching logic booleans to lookup flags" into main