Upgrading ResourceController and caching