This allows listeners to be setup and initial lookup caches to be kept,
which were thrown away after the initial calculation as an interim fix
for tdf#92749.

Change-Id: I34068b3f6b833a46f3c526579efbdc342a2e71df