Improved refresh checking