diff --git a/src/xenia/ui/vulkan/circular_buffer.cc b/src/xenia/ui/vulkan/circular_buffer.cc
index 43d868120..404f7a503 100644
--- a/src/xenia/ui/vulkan/circular_buffer.cc
+++ b/src/xenia/ui/vulkan/circular_buffer.cc
@@ -211,10 +211,10 @@ void CircularBuffer::Flush(Allocation* allocation) {
 }
 
 void CircularBuffer::Clear() {
-  for (auto it = allocations_.begin(); it != allocations_.end();) {
-    delete *it;
-    it = allocations_.erase(it);
+  for (auto alloc : allocations_) {
+    delete alloc;
   }
+  allocations_.clear();
 
   write_head_ = read_head_ = 0;
 }
diff --git a/src/xenia/ui/vulkan/circular_buffer.h b/src/xenia/ui/vulkan/circular_buffer.h
index 6e4331ab9..54aa916fd 100644
--- a/src/xenia/ui/vulkan/circular_buffer.h
+++ b/src/xenia/ui/vulkan/circular_buffer.h
@@ -10,7 +10,7 @@
 #ifndef XENIA_UI_VULKAN_CIRCULAR_BUFFER_H_
 #define XENIA_UI_VULKAN_CIRCULAR_BUFFER_H_
 
-#include <unordered_map>
+#include <list>
 
 #include "xenia/ui/vulkan/vulkan.h"
 #include "xenia/ui/vulkan/vulkan_device.h"
@@ -77,8 +77,7 @@ class CircularBuffer {
   VkDeviceSize gpu_base_ = 0;
   uint8_t* host_base_ = nullptr;
 
-  std::unordered_map<uint64_t, uintptr_t> allocation_cache_;
-  std::vector<Allocation*> allocations_;
+  std::list<Allocation*> allocations_;
 };
 
 }  // namespace vulkan