started on entityCache, still in progress