Merge "nuplayer: remove prefill cache code"