Fixed some caching issues with duplicate and delete