Added support for caching the library