Updated caching library methods