Added local, per-request entity caching