diff --git a/container_opts_unix.go b/container_opts_unix.go
index deda0f70f..5a281918d 100644
--- a/container_opts_unix.go
+++ b/container_opts_unix.go
@@ -115,7 +115,7 @@ func WithTaskCheckpoint(im Image) NewTaskOpts {
 	}
 }
 
-func decodeIndex(ctx context.Context, store content.Store, id digest.Digest) (*v1.Index, error) {
+func decodeIndex(ctx context.Context, store content.Provider, id digest.Digest) (*v1.Index, error) {
 	var index v1.Index
 	p, err := content.ReadBlob(ctx, store, id)
 	if err != nil {
diff --git a/diff/apply/apply.go b/diff/apply/apply.go
index 2988b2cae..57f0ae953 100644
--- a/diff/apply/apply.go
+++ b/diff/apply/apply.go
@@ -22,14 +22,14 @@ import (
 
 // NewFileSystemApplier returns an applier which simply mounts
 // and applies diff onto the mounted filesystem.
-func NewFileSystemApplier(cs content.Store) diff.Applier {
+func NewFileSystemApplier(cs content.Provider) diff.Applier {
 	return &fsApplier{
 		store: cs,
 	}
 }
 
 type fsApplier struct {
-	store content.Store
+	store content.Provider
 }
 
 var emptyDesc = ocispec.Descriptor{}
diff --git a/images/importexport.go b/images/importexport.go
index f8cf742ba..cd91d11a3 100644
--- a/images/importexport.go
+++ b/images/importexport.go
@@ -17,5 +17,5 @@ type Importer interface {
 // Exporter is the interface for image exporter.
 type Exporter interface {
 	// Export exports an image to a tar stream.
-	Export(ctx context.Context, store content.Store, desc ocispec.Descriptor, writer io.Writer) error
+	Export(ctx context.Context, store content.Provider, desc ocispec.Descriptor, writer io.Writer) error
 }
diff --git a/images/oci/exporter.go b/images/oci/exporter.go
index 9a559aa6e..8c1315697 100644
--- a/images/oci/exporter.go
+++ b/images/oci/exporter.go
@@ -25,7 +25,7 @@ type V1Exporter struct {
 }
 
 // Export implements Exporter.
-func (oe *V1Exporter) Export(ctx context.Context, store content.Store, desc ocispec.Descriptor, writer io.Writer) error {
+func (oe *V1Exporter) Export(ctx context.Context, store content.Provider, desc ocispec.Descriptor, writer io.Writer) error {
 	tw := tar.NewWriter(writer)
 	defer tw.Close()
 
@@ -67,7 +67,7 @@ type tarRecord struct {
 	CopyTo func(context.Context, io.Writer) (int64, error)
 }
 
-func blobRecord(cs content.Store, desc ocispec.Descriptor) tarRecord {
+func blobRecord(cs content.Provider, desc ocispec.Descriptor) tarRecord {
 	path := "blobs/" + desc.Digest.Algorithm().String() + "/" + desc.Digest.Hex()
 	return tarRecord{
 		Header: &tar.Header{
diff --git a/images/oci/importer.go b/images/oci/importer.go
index f024fafe8..ed3bf2bb0 100644
--- a/images/oci/importer.go
+++ b/images/oci/importer.go
@@ -113,7 +113,7 @@ func normalizeImageRef(imageName string, manifest ocispec.Descriptor) (string, e
 	return imageName + ":" + ociRef, nil
 }
 
-func onUntarBlob(ctx context.Context, r io.Reader, store content.Store, name string, size int64) error {
+func onUntarBlob(ctx context.Context, r io.Reader, store content.Ingester, name string, size int64) error {
 	// name is like "blobs/sha256/deadbeef"
 	split := strings.Split(name, "/")
 	if len(split) != 3 {
diff --git a/task.go b/task.go
index afa5e2400..68308b62d 100644
--- a/task.go
+++ b/task.go
@@ -572,7 +572,7 @@ func (t *task) writeIndex(ctx context.Context, index *v1.Index) (d v1.Descriptor
 	return writeContent(ctx, t.client.ContentStore(), v1.MediaTypeImageIndex, t.id, buf, content.WithLabels(labels))
 }
 
-func writeContent(ctx context.Context, store content.Store, mediaType, ref string, r io.Reader, opts ...content.Opt) (d v1.Descriptor, err error) {
+func writeContent(ctx context.Context, store content.Ingester, mediaType, ref string, r io.Reader, opts ...content.Opt) (d v1.Descriptor, err error) {
 	writer, err := store.Writer(ctx, ref, 0, "")
 	if err != nil {
 		return d, err