Fix issues with caching of objects during test run for performnace