Re-adding some commits for general clean up
 Added cache tag
Pre-deploy cleanup