Merge "Remove some comments regarding caching protected buffers" into main