Improved non blocking loading support
Cache directory improvements