Add more logging, prevent clobbering cache entries