Switched some of the caching mechanisms off
Corrected the core-lib problem and updated it