add _orignal to Entity and fix Counter cache update