Cache empty block as NULL.
Merge branch '6043' of github.com:openscholar/openscholar into 6043