Added cache class