Small unavailable bug fix
Cache & prefix updates