Added some caching to prevent one url from being called twice