Fix cache in entity change