Cleaned up the code around fetching more items

Also fixed the issue that images loaded from cache will not do the
animation