diff --git a/cpp/devices/disk.cpp b/cpp/devices/disk.cpp
index f8ff2cf661..3b90da1034 100644
--- a/cpp/devices/disk.cpp
+++ b/cpp/devices/disk.cpp
@@ -497,7 +497,7 @@ void Disk::AddCachePage(map<int, vector<byte>>& pages, bool changeable) const
 	pages[8] = buf;
 }
 
-int Disk::Read(vector<uint8_t>& buf, uint64_t block)
+int Disk::Read(span<uint8_t> buf, uint64_t block)
 {
 	assert(block < GetBlockCount());
 
@@ -510,7 +510,7 @@ int Disk::Read(vector<uint8_t>& buf, uint64_t block)
 	return GetSectorSizeInBytes();
 }
 
-void Disk::Write(const vector<uint8_t>& buf, uint64_t block)
+void Disk::Write(span<const uint8_t> buf, uint64_t block)
 {
 	assert(block < GetBlockCount());
 
diff --git a/cpp/devices/disk.h b/cpp/devices/disk.h
index 66f285a8ed..125c724ce2 100644
--- a/cpp/devices/disk.h
+++ b/cpp/devices/disk.h
@@ -53,9 +53,9 @@ class Disk : public StorageDevice, private ScsiBlockCommands
 
 	bool Eject(bool) override;
 
-	virtual void Write(const vector<uint8_t>&, uint64_t);
+	virtual void Write(span<const uint8_t>, uint64_t);
 
-	virtual int Read(vector<uint8_t>& , uint64_t);
+	virtual int Read(span<uint8_t> , uint64_t);
 
 	uint32_t GetSectorSizeInBytes() const;
 	bool IsSectorSizeConfigurable() const { return !sector_sizes.empty(); }
diff --git a/cpp/devices/disk_cache.cpp b/cpp/devices/disk_cache.cpp
index 8fc126db91..a2f1ee91d6 100644
--- a/cpp/devices/disk_cache.cpp
+++ b/cpp/devices/disk_cache.cpp
@@ -46,7 +46,7 @@ shared_ptr<DiskTrack> DiskCache::GetTrack(uint32_t block)
 	return Assign(track);
 }
 
-bool DiskCache::ReadSector(vector<uint8_t>& buf, uint32_t block)
+bool DiskCache::ReadSector(span<uint8_t> buf, uint32_t block)
 {
 	shared_ptr<DiskTrack> disktrk = GetTrack(block);
 	if (disktrk == nullptr) {
@@ -57,7 +57,7 @@ bool DiskCache::ReadSector(vector<uint8_t>& buf, uint32_t block)
 	return disktrk->ReadSector(buf, block & 0xff);
 }
 
-bool DiskCache::WriteSector(const vector<uint8_t>& buf, uint32_t block)
+bool DiskCache::WriteSector(span<const uint8_t> buf, uint32_t block)
 {
 	shared_ptr<DiskTrack> disktrk = GetTrack(block);
 	if (disktrk == nullptr) {
diff --git a/cpp/devices/disk_cache.h b/cpp/devices/disk_cache.h
index d9199b5c3e..4400e27de9 100644
--- a/cpp/devices/disk_cache.h
+++ b/cpp/devices/disk_cache.h
@@ -15,6 +15,7 @@
 
 #pragma once
 
+#include <span>
 #include <array>
 #include <memory>
 #include <string>
@@ -41,8 +42,8 @@ class DiskCache
 
 	// Access
 	bool Save() const;							// Save and release all
-	bool ReadSector(vector<uint8_t>&, uint32_t);				// Sector Read
-	bool WriteSector(const vector<uint8_t>&, uint32_t);		// Sector Write
+	bool ReadSector(span<uint8_t>, uint32_t);			// Sector Read
+	bool WriteSector(span<const uint8_t>, uint32_t);	// Sector Write
 
 private:
 
diff --git a/cpp/devices/disk_track.cpp b/cpp/devices/disk_track.cpp
index c6faec2199..33eecbc5e1 100644
--- a/cpp/devices/disk_track.cpp
+++ b/cpp/devices/disk_track.cpp
@@ -217,7 +217,7 @@ bool DiskTrack::Save(const string& path)
 	return true;
 }
 
-bool DiskTrack::ReadSector(vector<uint8_t>& buf, int sec) const
+bool DiskTrack::ReadSector(span<uint8_t> buf, int sec) const
 {
 	assert(sec >= 0 && sec < 0x100);
 
@@ -240,7 +240,7 @@ bool DiskTrack::ReadSector(vector<uint8_t>& buf, int sec) const
 	return true;
 }
 
-bool DiskTrack::WriteSector(const vector<uint8_t>& buf, int sec)
+bool DiskTrack::WriteSector(span<const uint8_t> buf, int sec)
 {
 	assert((sec >= 0) && (sec < 0x100));
 	assert(!dt.raw);
diff --git a/cpp/devices/disk_track.h b/cpp/devices/disk_track.h
index 786ab6e50e..9be597bb9c 100644
--- a/cpp/devices/disk_track.h
+++ b/cpp/devices/disk_track.h
@@ -16,6 +16,7 @@
 #pragma once
 
 #include <cstdlib>
+#include <span>
 #include <vector>
 #include <string>
 
@@ -52,8 +53,8 @@ class DiskTrack
 	bool Save(const string& path);
 
 	// Read / Write
-	bool ReadSector(vector<uint8_t>&, int) const;				// Sector Read
-	bool WriteSector(const vector<uint8_t>& buf, int);			// Sector Write
+	bool ReadSector(span<uint8_t>, int) const;				// Sector Read
+	bool WriteSector(span<const uint8_t> buf, int);			// Sector Write
 
 	int GetTrack() const		{ return dt.track; }		// Get track
 };
diff --git a/cpp/devices/scsicd.cpp b/cpp/devices/scsicd.cpp
index 649a2e4a70..d2d8c67220 100644
--- a/cpp/devices/scsicd.cpp
+++ b/cpp/devices/scsicd.cpp
@@ -216,7 +216,7 @@ void SCSICD::AddVendorPage(map<int, vector<byte>>& pages, int page, bool changea
 	}
 }
 
-int SCSICD::Read(vector<uint8_t>& buf, uint64_t block)
+int SCSICD::Read(span<uint8_t> buf, uint64_t block)
 {
 	CheckReady();
 
diff --git a/cpp/devices/scsicd.h b/cpp/devices/scsicd.h
index 2f70bf34dd..8c13bae145 100644
--- a/cpp/devices/scsicd.h
+++ b/cpp/devices/scsicd.h
@@ -33,7 +33,7 @@ class SCSICD : public Disk, private ScsiMmcCommands
 	void Open() override;
 
 	vector<uint8_t> InquiryInternal() const override;
-	int Read(vector<uint8_t>&, uint64_t) override;
+	int Read(span<uint8_t>, uint64_t) override;
 
 protected: