feat: enhance caching mechanisms to prevent memory leaks #847

MODSetter merged 2 commits intomainMODSetter/SurfSense:mainfrom

devMODSetter/SurfSense:devCopy head branch name to clipboard