Remove guard statement to cache