Merge "If requested then cache unprotected buffers even in protected mode" into sc-dev