clean code base
--amend
add scope based cache invalidation