Added caching to media list