Merge "Enable cache logging for debugging (w/ STOPSHIP)"