diff --git a/libs/hwui/GradientCache.h b/libs/hwui/GradientCache.h
index c829fd4..48877f6d3 100644
--- a/libs/hwui/GradientCache.h
+++ b/libs/hwui/GradientCache.h
@@ -20,7 +20,7 @@
 #include <SkShader.h>
 
 #include "Texture.h"
-#include "GenerationCache.h"
+#include "utils/GenerationCache.h"
 
 namespace android {
 namespace uirenderer {
diff --git a/libs/hwui/PatchCache.cpp b/libs/hwui/PatchCache.cpp
index 4dc1a4d..eca5e4d 100644
--- a/libs/hwui/PatchCache.cpp
+++ b/libs/hwui/PatchCache.cpp
@@ -73,8 +73,8 @@
                 pixelWidth, pixelHeight, xDivs, yDivs, width, height);
 
         if (mCache.size() >= mMaxEntries) {
-            delete mCache.valueAt(0);
-            mCache.removeItemsAt(0, 1);
+            delete mCache.valueAt(mCache.size() - 1);
+            mCache.removeItemsAt(mCache.size() - 1, 1);
         }
 
         mCache.add(description, mesh);
diff --git a/libs/hwui/PathCache.h b/libs/hwui/PathCache.h
index bde0e7d..596dfab 100644
--- a/libs/hwui/PathCache.h
+++ b/libs/hwui/PathCache.h
@@ -22,7 +22,7 @@
 #include <SkPath.h>
 
 #include "Texture.h"
-#include "GenerationCache.h"
+#include "utils/GenerationCache.h"
 
 namespace android {
 namespace uirenderer {
diff --git a/libs/hwui/TextDropShadowCache.h b/libs/hwui/TextDropShadowCache.h
index b65d62a..16e2814 100644
--- a/libs/hwui/TextDropShadowCache.h
+++ b/libs/hwui/TextDropShadowCache.h
@@ -21,7 +21,7 @@
 
 #include <SkPaint.h>
 
-#include "GenerationCache.h"
+#include "utils/GenerationCache.h"
 #include "FontRenderer.h"
 #include "Texture.h"
 
diff --git a/libs/hwui/TextureCache.h b/libs/hwui/TextureCache.h
index 34c5455..467e851 100644
--- a/libs/hwui/TextureCache.h
+++ b/libs/hwui/TextureCache.h
@@ -20,7 +20,7 @@
 #include <SkBitmap.h>
 
 #include "Texture.h"
-#include "GenerationCache.h"
+#include "utils/GenerationCache.h"
 
 namespace android {
 namespace uirenderer {
diff --git a/libs/hwui/GenerationCache.h b/libs/hwui/utils/GenerationCache.h
similarity index 100%
rename from libs/hwui/GenerationCache.h
rename to libs/hwui/utils/GenerationCache.h