FSBV: further simplify cache population missed in previous commit.
FSBV: further simplify cache population missed in previous commit.

attila-lendvai/cffi,mcna/cffi,dkochmanski/cffi,3b/cffi,stassats/cffi,3b/cffi,cffi/cffi,3b/cffi,dkochmanski/cffi,cffi/cffi,mcna/cffi,stassats/cffi,stassats/cffi,cffi/cffi,dkochmanski/cffi,attila-lendvai/cffi