#6142 - Adding minor comments to distinguish various portions of the caching logic