fixing some remaining issues, auto cache clearing