change to fit new api, and cache for 2 hours on long api endpoints