Revert "Workaround? Remove object from cache when deleted from context"

This reverts commit a1e06fa94467bba8e4ba931045f7d01986303760.