Fixed the gif caching/loading in the main stream