Extraction of Cache and Registration classes
Bugfix in Cache