Joso

Added CacheManager and fixed some flow regarding data class / filehandling