Avoid extra calls if there is a null/empty value in cache

same fix as #8, just on the latest code