Consistent controller api
Improved caching