Modified the cache library