Added caching to all API calls
Update TODO