Added cache definitions