Remove tests for deprecated objects
Remove cache entries for deprecated objects