Added thumbnail caching/generation