Modified to consider infoDictionary during caching.