Delete CacheTag and other improvements