added null check before expire
Merge branch 'hotfix/null-url-caching-bug'