Added cache option