Undo previous fix, uses CachePokedex incorrectly