couple of enhancements to crengine

This RP also brings back the cache fix from master