Added controller caching