Add Cache option - can't get it to work though so currently it only serves as a placeholder