Clean up CacheWord logic