A little more selective with cache invalidation
Fix warning
Hex