Added cache manager