fix: Clean up how objects are managed when they are fetched

fix: Clean up how objects are managed when they are fetched #10645