Refactored pickup image caching