Fixed cache issues
cleanup