Remove the issue statement about MapClass as CacheStorage is not a MapClass any more