#231 Rename @CacheRemoveEntry to @CacheRemove