Merge "Adding an image cache to be behind drawLayers."