Added caching-related functions