I was thinking we would use SKIP_CACHE_LOADER and only do the map and remove if the value was not null.