Re-fixed cache for images, fixed formatting.