Changed: use c++ map for caching images