Added local caching of class list