fix final tests
wip attempting to consolidate code..

causes a test failure in CacheServiceTest.. refs aren't being released
properly but no apparent reason why. Could separate this out - it's not
necessary.