Merge "libsnapshot: Cache Ops correctly" into main