Add controller caching fixes
Fixed issues with caching.