Mark cacheables with similar key

* Mark cacheables with similar key for easier cleanup