Small simplification
Be sure to pass the modified id back, otherwise, cache lookups will fail
Remove some duplication
Small cleanups