Worked on ID caching/invalidation