Added cache and index helpers