Added category registry and remove cache class