Embedding offline mode. Part#2 -> cache bug fix.