main
chore: add context to the cache interface (#9565)
fix(image): lookup origin layer for custom resources in merged layers (#10788)