Added entity cache module