Feature/cached output