Fixes #5441 deprecates the entity caching functions