Fixed Bug with caching layout (#5)