Be less aggressive about exiting cache full check early.
Merge branch 'develop' into basho