Addressed the nits
Remove Caches