Fixed behaviour of cache
Version 1.2.8