Added caching, fixed missing authentication