cleanup cache invalidation
add deleted flag
relative import
Merge pull request #3318 from dimagi/cache-cleanup

cleanup cache invalidation