Fix for cache clear issue and Breakpoints.