Added caching for pictures