Clean up some changes in cache branche