Improve add cache

Make the ADD caching more consistent + some cleanup