Updated controller, caching