Cache issues fixes. Made logs more reflective.