Restore caching in controller
Restore caching in controller

joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps