Cache service usage introduced, enclosing regex fixed
Bigger accounts support improved