Added caching to classes